qbs/modules/buildconfig/buildconfig.qbs

@@ -804,38 +804,36 @@ Module {
     }
 
     Properties {
+        condition: Utilities.versionCompare(qbs.version, "1.22") < 0
         cpp.systemIncludePaths: {
-            var paths = [FileInfo.joinPaths(product.buildDirectory, "qt.headers")];
+            var qtLibs = [
+                "QtCore",
+                "QtSvg",
+                "QtXml",
+                "QtPrintSupport",
+                "QtXmlPatterns",
+                "QtWidgets",
+                "QtGui",
+                "QtNetwork",
+                "QtTest",
+                "QtConcurrent"
+            ];
 
-            if (Utilities.versionCompare(qbs.version, "1.22") < 0) {
-                var qtLibs = [
-                    "QtCore",
-                    "QtSvg",
-                    "QtXml",
-                    "QtPrintSupport",
-                    "QtXmlPatterns",
-                    "QtWidgets",
-                    "QtGui",
-                    "QtNetwork",
-                    "QtTest",
-                    "QtConcurrent"
-                ];
+            var paths = [];
 
-                if (!qbs.targetOS.contains("macos"))
-                {
-                    paths.push(Qt.core.incPath);
+            if (!qbs.targetOS.contains("macos"))
+            {
+                paths.push(Qt.core.incPath);
 
-                    for (var i = 0; i < qtLibs.length; i++) {
-                        paths.push(FileInfo.joinPaths(Qt.core.incPath, qtLibs[i]));
-                    }
+                for (var i = 0; i < qtLibs.length; i++) {
+                    paths.push(FileInfo.joinPaths(Qt.core.incPath, qtLibs[i]));
+                }
 
-                } else {
-                    for (var i = 0; i < qtLibs.length; i++) {
-                        paths.push(FileInfo.joinPaths(Qt.core.incPath,
-                                                      qtLibs[i] + ".framework/Versions/" + Qt.core.versionMajor +
-                                                      "/Headers"));
-                        paths.push(FileInfo.joinPaths(Qt.core.incPath, qtLibs[i] + ".framework/Headers"));
-                    }
+            } else {
+                for (var i = 0; i < qtLibs.length; i++) {
+                    paths.push(FileInfo.joinPaths(Qt.core.incPath, qtLibs[i] + ".framework/Versions/" + Qt.core.versionMajor +
+                                                                   "/Headers"));
+                    paths.push(FileInfo.joinPaths(Qt.core.incPath, qtLibs[i] + ".framework/Headers"));
                 }
             }
 

src/libs/ifc/schema/pattern/v0.9.0.xsd

@@ -836,7 +836,7 @@
   </xs:simpleType>
   <xs:simpleType name="contentType">
     <xs:restriction base="xs:string">
-      <xs:pattern value="image/[-\w]+(\.[-\w]+)*([+][-\w]+)?"/>
+      <xs:pattern value="image\\/[-\w]+(\.[-\w]+)*([+][-\w]+)?"/>
     </xs:restriction>
   </xs:simpleType>
   <xs:simpleType name="colors">

src/libs/ifc/schema/pattern/v0.9.1.xsd

@@ -845,7 +845,7 @@
   </xs:simpleType>
   <xs:simpleType name="contentType">
     <xs:restriction base="xs:string">
-      <xs:pattern value="image/[-\w]+(\.[-\w]+)*([+][-\w]+)?"/>
+      <xs:pattern value="image\\/[-\w]+(\.[-\w]+)*([+][-\w]+)?"/>
     </xs:restriction>
   </xs:simpleType>
   <xs:simpleType name="colors">

src/libs/ifc/schema/pattern/v0.9.2.xsd

@@ -855,7 +855,7 @@
   </xs:simpleType>
   <xs:simpleType name="contentType">
     <xs:restriction base="xs:string">
-      <xs:pattern value="image/[-\w]+(\.[-\w]+)*([+][-\w]+)?"/>
+      <xs:pattern value="image\\/[-\w]+(\.[-\w]+)*([+][-\w]+)?"/>
     </xs:restriction>
   </xs:simpleType>
   <xs:simpleType name="colors">

src/libs/vmisc/vtextcodec.cpp

@@ -142,7 +142,6 @@ auto VTextCodec::availableCodecs() -> QList<QByteArray>
     while (i != codecs.constEnd())
     {
         names.append(ConstFirst(i.value()).toLatin1());
-        ++i;
     }
 
     return names;

src/test/ValentinaTest/tst_dxf.cpp

@@ -75,7 +75,6 @@ void TST_DXF::initTestCase()
 //---------------------------------------------------------------------------------------------------------------------
 void TST_DXF::TestCodecPage_data()
 {
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     QTest::addColumn<QString>("locale");
 
     QStringList locales = SupportedLocales();
@@ -84,13 +83,11 @@ void TST_DXF::TestCodecPage_data()
     {
         QTest::newRow(locale.toLatin1()) << locale;
     }
-#endif
 }
 
 //---------------------------------------------------------------------------------------------------------------------
 void TST_DXF::TestCodecPage()
 {
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     QFETCH(QString, locale);
 
     static QMap <QString, QString> locMap = LocaleMap();
@@ -125,7 +122,4 @@ void TST_DXF::TestCodecPage()
 
     QVERIFY2(codec != nullptr, qUtf8Printable(QStringLiteral("No codec for dxf codepage %1 found.")
                                               .arg(dxfCodePage)));
-#else
-    QSKIP("No full support for old codecs since Qt6.");
-#endif
 }

src/test/ValentinaTest/tst_dxf.h

@@ -30,12 +30,13 @@
 
 #include <QObject>
 
+#include "../vmisc/defglobal.h"
+
 class TST_DXF :public QObject
 {
     Q_OBJECT // NOLINT
 public:
     explicit TST_DXF(QObject *parent = nullptr);
-    ~TST_DXF() = default;
 
 private slots:
     void initTestCase();