Fixed Windows build.

--HG--
branch : develop

src/app/app.pro

@@ -546,25 +546,37 @@ for(DIR, INSTALL_STANDARD_MEASHUREMENTS) {
 
 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.
 # 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)
 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
 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
     # do nothing

src/app/main.cpp

@@ -29,6 +29,8 @@
 #include "mainwindow.h"
 #include "core/vapplication.h"
 
+#include <QMessageBox> // For QT_REQUIRE_VERSION
+
 #if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
 #   include "../libs/vmisc/backport/qcommandlineparser.h"
 #else

src/libs/vmisc/vabstractapplication.cpp

@@ -34,9 +34,9 @@ VAbstractApplication::VAbstractApplication(int &argc, char **argv)
     :QApplication(argc, argv),
       undoStack(nullptr),
       mainWindow(nullptr),
+      settings(nullptr),
       _patternUnit(Unit::Cm),
       _patternType(MeasurementsType::Individual),
-      settings(nullptr),
       currentScene(nullptr),
       sceneView(nullptr),
       doc(nullptr),

src/libs/vmisc/vabstractapplication.h

@@ -95,15 +95,17 @@ protected:
      */
     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.
      */
     VSettings          *settings;
 
+private:
+    Q_DISABLE_COPY(VAbstractApplication)
+    Unit               _patternUnit;
+    MeasurementsType   _patternType;
+
+
     QGraphicsScene     *currentScene;
     VMainGraphicsView  *sceneView;
 

src/libs/vpatterndb/vpatterndb.pro

@@ -7,6 +7,8 @@
 # File with common stuff for whole project
 include(../../../Valentina.pri)
 
+QT += widgets
+
 # Name of the library
 TARGET = vpatterndb