Merge

--HG--
branch : develop

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

src/app/core/vapplication.cpp

@@ -48,6 +48,8 @@
 #include <QStandardPaths>
 #include <QMessageBox>
 #include <QLoggingCategory>
+#include <QThread>
+#include <QDateTime>
 #include <QLockFile>
 #include <QtXmlPatterns>
 

src/app/core/vsettings.cpp

@@ -29,6 +29,8 @@
 #include "vsettings.h"
 
 #include <QDir>
+#include <QDebug>
+#include <QLocale>
 
 const QString VSettings::SettingConfigurationOsSeparator      = QStringLiteral("configuration/osSeparator");
 const QString VSettings::SettingConfigurationAutosaveState    = QStringLiteral("configuration/autosave/state");