Fixed Windows build.
--HG-- branch : develop
This commit is contained in:
parent
edc8664f3f
commit
0cf7a344a0
|
@ -546,25 +546,37 @@ for(DIR, INSTALL_STANDARD_MEASHUREMENTS) {
|
||||||
|
|
||||||
copyToDestdir($$st_path, $$shell_path($${OUT_PWD}/$$DESTDIR/tables/standard))
|
copyToDestdir($$st_path, $$shell_path($${OUT_PWD}/$$DESTDIR/tables/standard))
|
||||||
|
|
||||||
# QMuParser library
|
|
||||||
win32:CONFIG(release, debug|release): LIBS += -L$${OUT_PWD}/../libs/qmuparser/$${DESTDIR} -lqmuparser2
|
|
||||||
else:win32:CONFIG(debug, debug|release): LIBS += -L$${OUT_PWD}/../libs/qmuparser/$${DESTDIR} -lqmuparser2
|
|
||||||
else:unix: LIBS += -L$${OUT_PWD}/../libs/qmuparser/$${DESTDIR} -lqmuparser
|
|
||||||
|
|
||||||
INCLUDEPATH += $${PWD}/../libs/qmuparser
|
|
||||||
DEPENDPATH += $${PWD}/../libs/qmuparser
|
|
||||||
|
|
||||||
# VPropertyExplorer library
|
|
||||||
win32:CONFIG(release, debug|release): LIBS += -L$${OUT_PWD}/../libs/vpropertyexplorer/$${DESTDIR} -lvpropertyexplorer
|
|
||||||
else:win32:CONFIG(debug, debug|release): LIBS += -L$${OUT_PWD}/../libs/vpropertyexplorer/$${DESTDIR} -lvpropertyexplorer
|
|
||||||
else:unix: LIBS += -L$${OUT_PWD}/../libs/vpropertyexplorer/$${DESTDIR} -lvpropertyexplorer
|
|
||||||
|
|
||||||
INCLUDEPATH += $${PWD}/../libs/vpropertyexplorer
|
|
||||||
DEPENDPATH += $${PWD}/../libs/vpropertyexplorer
|
|
||||||
|
|
||||||
# When the GNU linker sees a library, it discards all symbols that it doesn't need.
|
# When the GNU linker sees a library, it discards all symbols that it doesn't need.
|
||||||
# Add dependent library the first.
|
# Add dependent library the first.
|
||||||
|
|
||||||
|
#VTools static library (depend on VWidgets, VMisc, VPatternDB)
|
||||||
|
unix|win32: LIBS += -L$$OUT_PWD/../libs/vtools/$${DESTDIR}/ -lvtools
|
||||||
|
|
||||||
|
INCLUDEPATH += $$PWD/../libs/vtools
|
||||||
|
INCLUDEPATH += $$OUT_PWD/../libs/vtools/$${UI_DIR} # For UI files
|
||||||
|
DEPENDPATH += $$PWD/../libs/vtools
|
||||||
|
|
||||||
|
win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vtools/$${DESTDIR}/vtools.lib
|
||||||
|
else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vtools/$${DESTDIR}/libvtools.a
|
||||||
|
|
||||||
|
#VMisc static library
|
||||||
|
unix|win32: LIBS += -L$$OUT_PWD/../libs/vmisc/$${DESTDIR}/ -lvmisc
|
||||||
|
|
||||||
|
INCLUDEPATH += $$PWD/../libs/vmisc
|
||||||
|
DEPENDPATH += $$PWD/../libs/vmisc
|
||||||
|
|
||||||
|
win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vmisc/$${DESTDIR}/vmisc.lib
|
||||||
|
else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vmisc/$${DESTDIR}/libvmisc.a
|
||||||
|
|
||||||
|
#VWidgets static library
|
||||||
|
unix|win32: LIBS += -L$$OUT_PWD/../libs/vwidgets/$${DESTDIR}/ -lvwidgets
|
||||||
|
|
||||||
|
INCLUDEPATH += $$PWD/../libs/vwidgets
|
||||||
|
DEPENDPATH += $$PWD/../libs/vwidgets
|
||||||
|
|
||||||
|
win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vwidgets/$${DESTDIR}/vwidgets.lib
|
||||||
|
else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vwidgets/$${DESTDIR}/libvwidgets.a
|
||||||
|
|
||||||
#VPatternDB static library (depend on vgeometry)
|
#VPatternDB static library (depend on vgeometry)
|
||||||
unix|win32: LIBS += -L$$OUT_PWD/../libs/vpatterndb/$${DESTDIR} -lvpatterndb
|
unix|win32: LIBS += -L$$OUT_PWD/../libs/vpatterndb/$${DESTDIR} -lvpatterndb
|
||||||
|
|
||||||
|
@ -610,33 +622,21 @@ DEPENDPATH += $$PWD/../libs/vlayout
|
||||||
win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vlayout/$${DESTDIR}/vlayout.lib
|
win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vlayout/$${DESTDIR}/vlayout.lib
|
||||||
else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vlayout/$${DESTDIR}/libvlayout.a
|
else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vlayout/$${DESTDIR}/libvlayout.a
|
||||||
|
|
||||||
#VTools static library (depend on vwidgets and vmisc)
|
# QMuParser library
|
||||||
unix|win32: LIBS += -L$$OUT_PWD/../libs/vtools/$${DESTDIR}/ -lvtools
|
win32:CONFIG(release, debug|release): LIBS += -L$${OUT_PWD}/../libs/qmuparser/$${DESTDIR} -lqmuparser2
|
||||||
|
else:win32:CONFIG(debug, debug|release): LIBS += -L$${OUT_PWD}/../libs/qmuparser/$${DESTDIR} -lqmuparser2
|
||||||
|
else:unix: LIBS += -L$${OUT_PWD}/../libs/qmuparser/$${DESTDIR} -lqmuparser
|
||||||
|
|
||||||
INCLUDEPATH += $$PWD/../libs/vtools
|
INCLUDEPATH += $${PWD}/../libs/qmuparser
|
||||||
INCLUDEPATH += $$OUT_PWD/../libs/vtools/$${UI_DIR} # For UI files
|
DEPENDPATH += $${PWD}/../libs/qmuparser
|
||||||
DEPENDPATH += $$PWD/../libs/vtools
|
|
||||||
|
|
||||||
win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vtools/$${DESTDIR}/vtools.lib
|
# VPropertyExplorer library
|
||||||
else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vtools/$${DESTDIR}/libvtools.a
|
win32:CONFIG(release, debug|release): LIBS += -L$${OUT_PWD}/../libs/vpropertyexplorer/$${DESTDIR} -lvpropertyexplorer
|
||||||
|
else:win32:CONFIG(debug, debug|release): LIBS += -L$${OUT_PWD}/../libs/vpropertyexplorer/$${DESTDIR} -lvpropertyexplorer
|
||||||
|
else:unix: LIBS += -L$${OUT_PWD}/../libs/vpropertyexplorer/$${DESTDIR} -lvpropertyexplorer
|
||||||
|
|
||||||
#VMisc static library
|
INCLUDEPATH += $${PWD}/../libs/vpropertyexplorer
|
||||||
unix|win32: LIBS += -L$$OUT_PWD/../libs/vmisc/$${DESTDIR}/ -lvmisc
|
DEPENDPATH += $${PWD}/../libs/vpropertyexplorer
|
||||||
|
|
||||||
INCLUDEPATH += $$PWD/../libs/vmisc
|
|
||||||
DEPENDPATH += $$PWD/../libs/vmisc
|
|
||||||
|
|
||||||
win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vmisc/$${DESTDIR}/vmisc.lib
|
|
||||||
else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vmisc/$${DESTDIR}/libvmisc.a
|
|
||||||
|
|
||||||
#VWidgets static library
|
|
||||||
unix|win32: LIBS += -L$$OUT_PWD/../libs/vwidgets/$${DESTDIR}/ -lvwidgets
|
|
||||||
|
|
||||||
INCLUDEPATH += $$PWD/../libs/vwidgets
|
|
||||||
DEPENDPATH += $$PWD/../libs/vwidgets
|
|
||||||
|
|
||||||
win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vwidgets/$${DESTDIR}/vwidgets.lib
|
|
||||||
else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vwidgets/$${DESTDIR}/libvwidgets.a
|
|
||||||
|
|
||||||
noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols
|
noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols
|
||||||
# do nothing
|
# do nothing
|
||||||
|
|
|
@ -29,6 +29,8 @@
|
||||||
#include "mainwindow.h"
|
#include "mainwindow.h"
|
||||||
#include "core/vapplication.h"
|
#include "core/vapplication.h"
|
||||||
|
|
||||||
|
#include <QMessageBox> // For QT_REQUIRE_VERSION
|
||||||
|
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
|
#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
|
||||||
# include "../libs/vmisc/backport/qcommandlineparser.h"
|
# include "../libs/vmisc/backport/qcommandlineparser.h"
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -34,9 +34,9 @@ VAbstractApplication::VAbstractApplication(int &argc, char **argv)
|
||||||
:QApplication(argc, argv),
|
:QApplication(argc, argv),
|
||||||
undoStack(nullptr),
|
undoStack(nullptr),
|
||||||
mainWindow(nullptr),
|
mainWindow(nullptr),
|
||||||
|
settings(nullptr),
|
||||||
_patternUnit(Unit::Cm),
|
_patternUnit(Unit::Cm),
|
||||||
_patternType(MeasurementsType::Individual),
|
_patternType(MeasurementsType::Individual),
|
||||||
settings(nullptr),
|
|
||||||
currentScene(nullptr),
|
currentScene(nullptr),
|
||||||
sceneView(nullptr),
|
sceneView(nullptr),
|
||||||
doc(nullptr),
|
doc(nullptr),
|
||||||
|
|
|
@ -95,15 +95,17 @@ protected:
|
||||||
*/
|
*/
|
||||||
QWidget *mainWindow;
|
QWidget *mainWindow;
|
||||||
|
|
||||||
private:
|
|
||||||
Q_DISABLE_COPY(VAbstractApplication)
|
|
||||||
Unit _patternUnit;
|
|
||||||
MeasurementsType _patternType;
|
|
||||||
/**
|
/**
|
||||||
* @brief settings pointer to settings. Help hide constructor creation settings. Make make code more readable.
|
* @brief settings pointer to settings. Help hide constructor creation settings. Make make code more readable.
|
||||||
*/
|
*/
|
||||||
VSettings *settings;
|
VSettings *settings;
|
||||||
|
|
||||||
|
private:
|
||||||
|
Q_DISABLE_COPY(VAbstractApplication)
|
||||||
|
Unit _patternUnit;
|
||||||
|
MeasurementsType _patternType;
|
||||||
|
|
||||||
|
|
||||||
QGraphicsScene *currentScene;
|
QGraphicsScene *currentScene;
|
||||||
VMainGraphicsView *sceneView;
|
VMainGraphicsView *sceneView;
|
||||||
|
|
||||||
|
|
|
@ -7,6 +7,8 @@
|
||||||
# File with common stuff for whole project
|
# File with common stuff for whole project
|
||||||
include(../../../Valentina.pri)
|
include(../../../Valentina.pri)
|
||||||
|
|
||||||
|
QT += widgets
|
||||||
|
|
||||||
# Name of the library
|
# Name of the library
|
||||||
TARGET = vpatterndb
|
TARGET = vpatterndb
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user