Added missing includes.
Also added extra line in app.pro to fix library copy error when building on macosx --HG-- branch : develop
This commit is contained in:
parent
b48f9032f9
commit
2697bdeef7
|
@ -107,7 +107,7 @@ 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()
|
#$$enable_ccache()
|
||||||
|
|
||||||
# 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 +312,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 +394,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
|
||||||
|
|
|
@ -48,6 +48,8 @@
|
||||||
#include <QStandardPaths>
|
#include <QStandardPaths>
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
#include <QLoggingCategory>
|
#include <QLoggingCategory>
|
||||||
|
#include <QThread>
|
||||||
|
#include <QDateTime>
|
||||||
|
|
||||||
Q_LOGGING_CATEGORY(vApp, "v.application")
|
Q_LOGGING_CATEGORY(vApp, "v.application")
|
||||||
|
|
||||||
|
|
|
@ -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");
|
||||||
|
|
Loading…
Reference in New Issue
Block a user