From 2697bdeef7fe6dc61fe68ebad89fa11f2f525f5b Mon Sep 17 00:00:00 2001 From: MitSchoko Date: Fri, 28 Nov 2014 19:33:28 +0100 Subject: [PATCH] Added missing includes. Also added extra line in app.pro to fix library copy error when building on macosx --HG-- branch : develop --- src/app/app.pro | 4 +++- src/app/core/vapplication.cpp | 2 ++ src/app/core/vsettings.cpp | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/app/app.pro b/src/app/app.pro index 22d0a50b7..24c77f7f0 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -107,7 +107,7 @@ TRANSLATIONS += share/translations/valentina.ts \ share/translations/valentina_nl_NL.ts # Set using ccache. Function enable_ccache() defined in Valentina.pri. -$$enable_ccache() +#$$enable_ccache() # Set precompiled headers. Function set_PCH() defined in Valentina.pri. $$set_PCH() @@ -312,6 +312,7 @@ unix{ qmuparser.path = $$FRAMEWORKS_DIR qmuparser.files = $${OUT_PWD}/../libs/qmuparser/$${DESTDIR}/ + qmuparser.files += $${OUT_PWD}/../libs/qmuparser/$${DESTDIR}/libqmuparser.2.dylib vpropertyexplorer.path = $$FRAMEWORKS_DIR vpropertyexplorer.files = $${OUT_PWD}/../libs/vpropertyexplorer/$${DESTDIR}/ @@ -393,6 +394,7 @@ CONFIG(release, debug|release){ } + macx{ # run macdeployqt to include all qt libraries in packet QMAKE_POST_LINK += $$[QT_INSTALL_BINS]/macdeployqt $${OUT_PWD}/$${DESTDIR}/$${TARGET}.app diff --git a/src/app/core/vapplication.cpp b/src/app/core/vapplication.cpp index c6c212e01..2fa1341fa 100644 --- a/src/app/core/vapplication.cpp +++ b/src/app/core/vapplication.cpp @@ -48,6 +48,8 @@ #include #include #include +#include +#include Q_LOGGING_CATEGORY(vApp, "v.application") diff --git a/src/app/core/vsettings.cpp b/src/app/core/vsettings.cpp index dbf8d4e1c..89e93b423 100644 --- a/src/app/core/vsettings.cpp +++ b/src/app/core/vsettings.cpp @@ -29,6 +29,8 @@ #include "vsettings.h" #include +#include +#include const QString VSettings::SettingConfigurationOsSeparator = QStringLiteral("configuration/osSeparator"); const QString VSettings::SettingConfigurationAutosaveState = QStringLiteral("configuration/autosave/state");