diff --git a/src/app/tape/dialogs/dialogmeasurementscsvcolumns.h b/src/app/tape/dialogs/dialogmeasurementscsvcolumns.h
index 456aeb82f..7470e14b9 100644
--- a/src/app/tape/dialogs/dialogmeasurementscsvcolumns.h
+++ b/src/app/tape/dialogs/dialogmeasurementscsvcolumns.h
@@ -33,6 +33,7 @@
 #include "../vformat/vdimensions.h"
 
 class QxtCsvModel;
+class QTextCodec;
 
 enum class IndividualMeasurementsColumns: qint8
 {
diff --git a/src/app/tape/tape.qbs b/src/app/tape/tape.qbs
index 8a2b3e9b2..cb38fa0fe 100644
--- a/src/app/tape/tape.qbs
+++ b/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
diff --git a/src/app/valentina/mainwindowsnogui.cpp b/src/app/valentina/mainwindowsnogui.cpp
index dab8c1c91..e610454af 100644
--- a/src/app/valentina/mainwindowsnogui.cpp
+++ b/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>
diff --git a/src/libs/vdxf/vdxf.qbs b/src/libs/vdxf/vdxf.qbs
index 136507126..d119da75e 100644
--- a/src/libs/vdxf/vdxf.qbs
+++ b/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: [
diff --git a/src/libs/vmisc/vmisc.qbs b/src/libs/vmisc/vmisc.qbs
index a49bb94ec..867b89e35 100644
--- a/src/libs/vmisc/vmisc.qbs
+++ b/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: [
diff --git a/src/libs/vwidgets/vwidgets.qbs b/src/libs/vwidgets/vwidgets.qbs
index 1f68787a9..d3cab934f 100644
--- a/src/libs/vwidgets/vwidgets.qbs
+++ b/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",
diff --git a/src/test/ValentinaTest/ValentinaTest.qbs b/src/test/ValentinaTest/ValentinaTest.qbs
index 6f08262cd..fafbf7327 100644
--- a/src/test/ValentinaTest/ValentinaTest.qbs
+++ b/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