Remove compat code for specifying only one major version for test

This predates us being able to specify all supported versions
KDE · Jan 25, 2024 · f58eff0 · f58eff0
1 parent 71a78d6
commit f58eff0
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 25 deletions.
diff --git a/tests/qt4-qstring-from-array/config.json b/tests/qt4-qstring-from-array/config.json
@@ -1,9 +1,9 @@
 {
-    "tests" : [
+    "tests": [
         {
-            "filename" : "main.cpp",
-            "qt_major_version": 4,
-            "has_fixits" : true
+            "filename": "main.cpp",
+            "qt_major_versions": [4],
+            "has_fixits": true
         }
     ]
 }
diff --git a/tests/qt6-deprecated-api-fixes/config.json b/tests/qt6-deprecated-api-fixes/config.json
@@ -1,12 +1,12 @@
 {
-    "minimum_clang_version" : 1000,
-    "tests" : [
+    "minimum_clang_version": 1000,
+    "tests": [
         {
-            "filename" : "main.cpp",
-            "qt_major_version": 5,
-            "minimum_qt_version" : 51400,
-            "maximum_qt_version" : 60000,
-            "has_fixits" : true
+            "filename": "main.cpp",
+            "qt_major_versions": [5],
+            "minimum_qt_version": 51400,
+            "maximum_qt_version": 60000,
+            "has_fixits": true
         }
     ]
 }
diff --git a/tests/qt6-header-fixes/config.json b/tests/qt6-header-fixes/config.json
@@ -1,10 +1,10 @@
 {
-    "tests" : [
+    "tests": [
         {
-            "filename" : "main.cpp",
-            "qt_major_version": 5,
-            "has_fixits" : true,
-            "extra_definitions": "-DQT_NO_OPENGL -DQT_QTQUICK_MODULE_H "
+            "filename": "main.cpp",
+            "qt_major_versions": [5],
+            "has_fixits": true,
+            "extra_definitions": "-DQT_NO_OPENGL -DQT_QTQUICK_MODULE_H"
         }
     ]
 }
diff --git a/tests/qt6-qlatin1stringchar-to-u/config.json b/tests/qt6-qlatin1stringchar-to-u/config.json
@@ -1,12 +1,10 @@
 {
-    "tests" : [
+    "tests": [
         {
-            "filename" : "main.cpp",
-            "qt_major_version": 5,
-            "cppStandards" : [ "c++14" ],
-            "minimum_qt_version" : 50000,
-            "has_fixits" : true,
-            "minimum_clang_version" : 1100
+            "filename": "main.cpp",
+            "qt_major_versions": [5],
+            "has_fixits": true,
+            "minimum_clang_version": 1100
         }
     ]
 }
diff --git a/tests/run_tests.py b/tests/run_tests.py
@@ -273,8 +273,6 @@ def load_json(check_name):
                 test.compare_everything = t['compare_everything']
             if 'link' in t:
                 test.link = t['link']
-            if 'qt_major_version' in t: # single value (for compatibility)
-                test.setQtMajorVersions([t['qt_major_version']])
             if 'qt_major_versions' in t:
                 test.setQtMajorVersions(t['qt_major_versions'])
             if 'env' in t: