Temporary use Qt 5 Core Compatibility module.

src/app/tape/dialogs/dialogmeasurementscsvcolumns.h

@@ -33,6 +33,7 @@
 #include "../vformat/vdimensions.h"
 
 class QxtCsvModel;
+class QTextCodec;
 
 enum class IndividualMeasurementsColumns: qint8
 {

src/app/tape/tape.qbs

@@ -1,9 +1,10 @@
 import qbs.FileInfo
+import qbs.Utilities
 
 VToolApp {
     Depends { name: "buildconfig" }
     Depends { name: "ib"; condition: qbs.targetOS.contains("macos") }
-    Depends { name: "Qt"; submodules: ["widgets", "svg"] }
+    Depends { name: "Qt"; submodules: ["core", "widgets", "svg"] }
     Depends { name: "VMiscLib"; }
     Depends { name: "VPatternDBLib"; }
     Depends { name: "FervorLib"; }
@@ -14,6 +15,11 @@ VToolApp {
     Depends { name: "ebr" }
     Depends { name: "multibundle"; }
 
+    Depends {
+        name: "Qt.core5compat";
+        condition: Utilities.versionCompare(Qt.core.version, "6") >= 0
+    }
+
     name: "Tape"
     buildconfig.appTarget: qbs.targetOS.contains("macos") ? "Tape" : "tape"
     targetName: buildconfig.appTarget

src/app/valentina/mainwindowsnogui.cpp

@@ -62,6 +62,7 @@
 #include <functional>
 #include <QPageSize>
 #include <QDebug>
+#include <QTextCodec>
 
 #if defined(Q_OS_WIN32) && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
 #include <QWinTaskbarButton>

src/libs/vdxf/vdxf.qbs

@@ -1,6 +1,13 @@
+import qbs.Utilities
+
 VLib {
     Depends { name: "VMiscLib" }
-    Depends { name: "Qt"; submodules: ["gui"] }
+    Depends { name: "Qt"; submodules: ["core", "gui"] }
+
+    Depends {
+        name: "Qt.core5compat";
+        condition: Utilities.versionCompare(Qt.core.version, "6") >= 0
+    }
 
     name: "VDXFLib"
     files: [

src/libs/vmisc/vmisc.qbs

@@ -1,5 +1,12 @@
+import qbs.Utilities
+
 VLib {
-    Depends { name: "Qt"; submodules: ["printsupport"] }
+    Depends { name: "Qt"; submodules: ["core", "printsupport"] }
+
+    Depends {
+        name: "Qt.core5compat";
+        condition: Utilities.versionCompare(Qt.core.version, "6") >= 0
+    }
 
     name: "VMiscLib"
     files: [

src/libs/vwidgets/vwidgets.qbs

@@ -1,8 +1,15 @@
+import qbs.Utilities
+
 VLib {
-    Depends { name: "Qt"; submodules: ["widgets"] }
+    Depends { name: "Qt"; submodules: ["core", "widgets"] }
     Depends { name: "VMiscLib" }
     Depends { name: "VPropertyExplorerLib" }
 
+    Depends {
+        name: "Qt.openglwidgets";
+        condition: Utilities.versionCompare(Qt.core.version, "6") >= 0
+    }
+
     name: "VWidgetsLib"
     files: [
         "qtcolorpicker.cpp",

src/test/ValentinaTest/ValentinaTest.qbs

@@ -1,7 +1,9 @@
+import qbs.Utilities
+
 VTestApp {
     Depends { name: "buildconfig" }
     Depends { name: "VTestLib" }
-    Depends { name: "Qt"; submodules: ["testlib"] }
+    Depends { name: "Qt"; submodules: ["core", "testlib"] }
     Depends { name: "VToolsLib" }
     Depends { name: "VGeometryLib" }
     Depends { name: "IFCLib" }
@@ -9,6 +11,11 @@ VTestApp {
     Depends { name: "VFormatLib" }
     Depends { name: "ebr" }
 
+    Depends {
+        name: "Qt.core5compat";
+        condition: Utilities.versionCompare(Qt.core.version, "6") >= 0
+    }
+
     name: "ValentinaTest"
     buildconfig.appTarget: qbs.targetOS.contains("macos") ? "ValentinaTest" : "valentinaTest"
     targetName: buildconfig.appTarget