diff --git a/src/app/app.pro b/src/app/app.pro index 22d0a50b7..c03becd63 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -107,8 +107,9 @@ TRANSLATIONS += share/translations/valentina.ts \ share/translations/valentina_nl_NL.ts # Set using ccache. Function enable_ccache() defined in Valentina.pri. -$$enable_ccache() - +!macx { + $$enable_ccache() #enabling ccache causes errors when using osx +} # Set precompiled headers. Function set_PCH() defined in Valentina.pri. $$set_PCH() @@ -312,6 +313,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 +395,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 4db028bd5..dd2febab4 100644 --- a/src/app/core/vapplication.cpp +++ b/src/app/core/vapplication.cpp @@ -48,6 +48,8 @@ #include #include #include +#include +#include #include #include diff --git a/src/app/core/vsettings.cpp b/src/app/core/vsettings.cpp index 96105e988..7f507a9e9 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");