diff --git a/src/libs/vmisc/vtextcodec.cpp b/src/libs/vmisc/vtextcodec.cpp
index 05278f3d2..ea6d19fd6 100644
--- a/src/libs/vmisc/vtextcodec.cpp
+++ b/src/libs/vmisc/vtextcodec.cpp
@@ -142,6 +142,7 @@ auto VTextCodec::availableCodecs() -> QList<QByteArray>
     while (i != codecs.constEnd())
     {
         names.append(ConstFirst(i.value()).toLatin1());
+        ++i;
     }
 
     return names;
diff --git a/src/test/ValentinaTest/tst_dxf.cpp b/src/test/ValentinaTest/tst_dxf.cpp
index 14be7d5cb..2fcbfaca3 100644
--- a/src/test/ValentinaTest/tst_dxf.cpp
+++ b/src/test/ValentinaTest/tst_dxf.cpp
@@ -75,6 +75,7 @@ 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();
@@ -83,11 +84,13 @@ 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();
@@ -122,4 +125,7 @@ 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
 }
diff --git a/src/test/ValentinaTest/tst_dxf.h b/src/test/ValentinaTest/tst_dxf.h
index 6509f008f..d770e4afd 100644
--- a/src/test/ValentinaTest/tst_dxf.h
+++ b/src/test/ValentinaTest/tst_dxf.h
@@ -30,13 +30,12 @@
 
 #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();