aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : develop
This commit is contained in:
dismine 2014-11-30 17:43:14 +02:00
commit 412d81fc3a
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/app.pro
View File

@ -107,8 +107,9 @@ TRANSLATIONS += share/translations/valentina.ts \
share/translations/valentina_nl_NL.ts share/translations/valentina_nl_NL.ts
# Set using ccache. Function enable_ccache() defined in Valentina.pri. # 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 precompiled headers. Function set_PCH() defined in Valentina.pri.
$$set_PCH() $$set_PCH()
@ -312,6 +313,7 @@ unix{
qmuparser.path = $$FRAMEWORKS_DIR qmuparser.path = $$FRAMEWORKS_DIR
qmuparser.files = $${OUT_PWD}/../libs/qmuparser/$${DESTDIR}/ qmuparser.files = $${OUT_PWD}/../libs/qmuparser/$${DESTDIR}/
qmuparser.files += $${OUT_PWD}/../libs/qmuparser/$${DESTDIR}/libqmuparser.2.dylib
vpropertyexplorer.path = $$FRAMEWORKS_DIR vpropertyexplorer.path = $$FRAMEWORKS_DIR
vpropertyexplorer.files = $${OUT_PWD}/../libs/vpropertyexplorer/$${DESTDIR}/ vpropertyexplorer.files = $${OUT_PWD}/../libs/vpropertyexplorer/$${DESTDIR}/
@ -393,6 +395,7 @@ CONFIG(release, debug|release){
} }
macx{ macx{
# run macdeployqt to include all qt libraries in packet # run macdeployqt to include all qt libraries in packet
QMAKE_POST_LINK += $$[QT_INSTALL_BINS]/macdeployqt $${OUT_PWD}/$${DESTDIR}/$${TARGET}.app QMAKE_POST_LINK += $$[QT_INSTALL_BINS]/macdeployqt $${OUT_PWD}/$${DESTDIR}/$${TARGET}.app

2
src/app/core/vapplication.cpp
View File

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

2
src/app/core/vsettings.cpp
View File

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