157 files changed, 21 insertions, 3 deletions

diff --git a/src/lib/corelib/language/language.pri b/src/lib/corelib/language/language.pri
index ca8fad22c..2eb9efcb9 100644
--- a/src/lib/corelib/language/language.pri
+++ b/src/lib/corelib/language/language.pri
@@ -77,7 +77,6 @@ SOURCES += \
 qbs_enable_unit_tests {
     HEADERS += $$PWD/tst_language.h
     SOURCES += $$PWD/tst_language.cpp
-    OTHER_FILES += $$PWD/testdata/*
 }
 
 !qbs_no_dev_install {
diff --git a/src/lib/corelib/language/tst_language.cpp b/src/lib/corelib/language/tst_language.cpp
index ad76bd1c8..dc70d45fb 100644
--- a/src/lib/corelib/language/tst_language.cpp
+++ b/src/lib/corelib/language/tst_language.cpp
@@ -72,8 +72,10 @@ Q_DECLARE_METATYPE(QList<bool>)
 
 namespace qbs {
 namespace Internal {
-static QString testDataDir() { return FileInfo::resolvePath(QLatin1String(SRCDIR),
-                                                            QLatin1String("language/testdata")); }
+static QString testDataDir() {
+    return FileInfo::resolvePath(QLatin1String(SRCDIR),
+                                 QLatin1String("../../../tests/auto/language/testdata"));
+}
 static QString testProject(const char *fileName) {
     return testDataDir() + QLatin1Char('/') + QLatin1String(fileName);
 }
diff --git a/tests/auto/language/language.pro b/tests/auto/language/language.pro
index f52798e71..1206bd328 100644
--- a/tests/auto/language/language.pro
+++ b/tests/auto/language/language.pro
@@ -4,3 +4,13 @@ SOURCES = tst_language.cpp
 
 include(../auto.pri)
 include(../../../src/app/shared/logging/logging.pri)
+
+DATA_DIRS = testdata
+
+for(data_dir, DATA_DIRS) {
+    files = $$files($$PWD/$$data_dir/*, true)
+    win32:files ~= s|\\\\|/|g
+    for(file, files):!exists($$file/*):FILES += $$file
+}
+
+OTHER_FILES += $$FILES
diff --git a/tests/auto/language/language.qbs b/tests/auto/language/language.qbs
index 9fda49ce6..b78c568a6 100644
--- a/tests/auto/language/language.qbs
+++ b/tests/auto/language/language.qbs
@@ -4,4 +4,11 @@ QbsAutotest {
     testName: "language"
     condition: qbsbuildconfig.enableUnitTests
     files: "tst_language.cpp"
+
+    Group {
+        name: "testdata"
+        prefix: "testdata/"
+        files: ["**/*"]
+        fileTags: []
+    }
 }
diff --git a/src/lib/corelib/language/testdata/Banana b/tests/auto/language/testdata/Banana
index 53164be8a..53164be8a 100644
--- a/src/lib/corelib/language/testdata/Banana
+++ b/tests/auto/language/testdata/Banana
diff --git a/src/lib/corelib/language/testdata/MyProperties.qbs b/tests/auto/language/testdata/MyProperties.qbs
index b29bfc18f..b29bfc18f 100644
--- a/src/lib/corelib/language/testdata/MyProperties.qbs
+++ b/tests/auto/language/testdata/MyProperties.qbs
diff --git a/src/lib/corelib/language/testdata/ParentWithExport.qbs b/tests/auto/language/testdata/ParentWithExport.qbs
index 16f9a2cd1..16f9a2cd1 100644
--- a/src/lib/corelib/language/testdata/ParentWithExport.qbs
+++ b/tests/auto/language/testdata/ParentWithExport.qbs
diff --git a/src/lib/corelib/language/testdata/aboutdialog.cpp b/tests/auto/language/testdata/aboutdialog.cpp
index e69de29bb..e69de29bb 100644
--- a/src/lib/corelib/language/testdata/aboutdialog.cpp
+++ b/tests/auto/language/testdata/aboutdialog.cpp
diff --git a/src/lib/corelib/language/testdata/base-validate/base-validate.qbs b/tests/auto/language/testdata/base-validate/base-validate.qbs
index b1b025f94..b1b025f94 100644
--- a/src/lib/corelib/language/testdata/base-validate/base-validate.qbs
+++ b/tests/auto/language/testdata/base-validate/base-validate.qbs
diff --git a/src/lib/corelib/language/testdata/base-validate/modules/m/MParent.qbs b/tests/auto/language/testdata/base-validate/modules/m/MParent.qbs
index 9874fbd5d..9874fbd5d 100644
--- a/src/lib/corelib/language/testdata/base-validate/modules/m/MParent.qbs
+++ b/tests/auto/language/testdata/base-validate/modules/m/MParent.qbs
diff --git a/src/lib/corelib/language/testdata/base-validate/modules/m/m.qbs b/tests/auto/language/testdata/base-validate/modules/m/m.qbs
index 6fcdc9ebc..6fcdc9ebc 100644
--- a/src/lib/corelib/language/testdata/base-validate/modules/m/m.qbs
+++ b/tests/auto/language/testdata/base-validate/modules/m/m.qbs
diff --git a/src/lib/corelib/language/testdata/baseproperty.qbs b/tests/auto/language/testdata/baseproperty.qbs
index 74024aedc..74024aedc 100644
--- a/src/lib/corelib/language/testdata/baseproperty.qbs
+++ b/tests/auto/language/testdata/baseproperty.qbs
diff --git a/src/lib/corelib/language/testdata/baseproperty_base.qbs b/tests/auto/language/testdata/baseproperty_base.qbs
index 85b64b76e..85b64b76e 100644
--- a/src/lib/corelib/language/testdata/baseproperty_base.qbs
+++ b/tests/auto/language/testdata/baseproperty_base.qbs
diff --git a/src/lib/corelib/language/testdata/buildconfigstringlistsyntax.qbs b/tests/auto/language/testdata/buildconfigstringlistsyntax.qbs
index 623919317..623919317 100644
--- a/src/lib/corelib/language/testdata/buildconfigstringlistsyntax.qbs
+++ b/tests/auto/language/testdata/buildconfigstringlistsyntax.qbs
diff --git a/src/lib/corelib/language/testdata/builtinFunctionInSearchPathsProperty.qbs b/tests/auto/language/testdata/builtinFunctionInSearchPathsProperty.qbs
index 0df9f4d5c..0df9f4d5c 100644
--- a/src/lib/corelib/language/testdata/builtinFunctionInSearchPathsProperty.qbs
+++ b/tests/auto/language/testdata/builtinFunctionInSearchPathsProperty.qbs
diff --git a/src/lib/corelib/language/testdata/canonicalArchitecture.qbs b/tests/auto/language/testdata/canonicalArchitecture.qbs
index 16c040ba0..16c040ba0 100644
--- a/src/lib/corelib/language/testdata/canonicalArchitecture.qbs
+++ b/tests/auto/language/testdata/canonicalArchitecture.qbs
diff --git a/src/lib/corelib/language/testdata/conditionaldepends.qbs b/tests/auto/language/testdata/conditionaldepends.qbs
index 8ad3660ec..8ad3660ec 100644
--- a/src/lib/corelib/language/testdata/conditionaldepends.qbs
+++ b/tests/auto/language/testdata/conditionaldepends.qbs
diff --git a/src/lib/corelib/language/testdata/conditionaldepends_base.qbs b/tests/auto/language/testdata/conditionaldepends_base.qbs
index 81782ba44..81782ba44 100644
--- a/src/lib/corelib/language/testdata/conditionaldepends_base.qbs
+++ b/tests/auto/language/testdata/conditionaldepends_base.qbs
diff --git a/src/lib/corelib/language/testdata/defaultvalue/egon.qbs b/tests/auto/language/testdata/defaultvalue/egon.qbs
index 7b254b0c8..7b254b0c8 100644
--- a/src/lib/corelib/language/testdata/defaultvalue/egon.qbs
+++ b/tests/auto/language/testdata/defaultvalue/egon.qbs
diff --git a/src/lib/corelib/language/testdata/defaultvalue/modules/higher/higher.qbs b/tests/auto/language/testdata/defaultvalue/modules/higher/higher.qbs
index 9894f80cf..9894f80cf 100644
--- a/src/lib/corelib/language/testdata/defaultvalue/modules/higher/higher.qbs
+++ b/tests/auto/language/testdata/defaultvalue/modules/higher/higher.qbs
diff --git a/src/lib/corelib/language/testdata/defaultvalue/modules/lower/lower.qbs b/tests/auto/language/testdata/defaultvalue/modules/lower/lower.qbs
index 0540185e9..0540185e9 100644
--- a/src/lib/corelib/language/testdata/defaultvalue/modules/lower/lower.qbs
+++ b/tests/auto/language/testdata/defaultvalue/modules/lower/lower.qbs
diff --git a/src/lib/corelib/language/testdata/defaultvalue/test.txt b/tests/auto/language/testdata/defaultvalue/test.txt
index e69de29bb..e69de29bb 100644
--- a/src/lib/corelib/language/testdata/defaultvalue/test.txt
+++ b/tests/auto/language/testdata/defaultvalue/test.txt
diff --git a/src/lib/corelib/language/testdata/delayed-error/modules/m/m.qbs b/tests/auto/language/testdata/delayed-error/modules/m/m.qbs
index 8529f47a4..8529f47a4 100644
--- a/src/lib/corelib/language/testdata/delayed-error/modules/m/m.qbs
+++ b/tests/auto/language/testdata/delayed-error/modules/m/m.qbs
diff --git a/src/lib/corelib/language/testdata/delayed-error/nonexisting.qbs b/tests/auto/language/testdata/delayed-error/nonexisting.qbs
index 3825146c6..3825146c6 100644
--- a/src/lib/corelib/language/testdata/delayed-error/nonexisting.qbs
+++ b/tests/auto/language/testdata/delayed-error/nonexisting.qbs
diff --git a/src/lib/corelib/language/testdata/delayed-error/validation.qbs b/tests/auto/language/testdata/delayed-error/validation.qbs
index e78c1d9e8..e78c1d9e8 100644
--- a/src/lib/corelib/language/testdata/delayed-error/validation.qbs
+++ b/tests/auto/language/testdata/delayed-error/validation.qbs
diff --git a/src/lib/corelib/language/testdata/dependencyOnAllProfiles.qbs b/tests/auto/language/testdata/dependencyOnAllProfiles.qbs
index f3b771315..f3b771315 100644
--- a/src/lib/corelib/language/testdata/dependencyOnAllProfiles.qbs
+++ b/tests/auto/language/testdata/dependencyOnAllProfiles.qbs
diff --git a/src/lib/corelib/language/testdata/derived-sub-project/DerivedSubProject.qbs b/tests/auto/language/testdata/derived-sub-project/DerivedSubProject.qbs
index 313e04f24..313e04f24 100644
--- a/src/lib/corelib/language/testdata/derived-sub-project/DerivedSubProject.qbs
+++ b/tests/auto/language/testdata/derived-sub-project/DerivedSubProject.qbs
diff --git a/src/lib/corelib/language/testdata/derived-sub-project/project.qbs b/tests/auto/language/testdata/derived-sub-project/project.qbs
index 1aadd92ae..1aadd92ae 100644
--- a/src/lib/corelib/language/testdata/derived-sub-project/project.qbs
+++ b/tests/auto/language/testdata/derived-sub-project/project.qbs
diff --git a/src/lib/corelib/language/testdata/derived-sub-project/subproject.qbs b/tests/auto/language/testdata/derived-sub-project/subproject.qbs
index 18dc695f3..18dc695f3 100644
--- a/src/lib/corelib/language/testdata/derived-sub-project/subproject.qbs
+++ b/tests/auto/language/testdata/derived-sub-project/subproject.qbs
diff --git a/src/lib/corelib/language/testdata/drawline.asm b/tests/auto/language/testdata/drawline.asm
index e69de29bb..e69de29bb 100644
--- a/src/lib/corelib/language/testdata/drawline.asm
+++ b/tests/auto/language/testdata/drawline.asm
diff --git a/src/lib/corelib/language/testdata/dummy.txt b/tests/auto/language/testdata/dummy.txt
index e69de29bb..e69de29bb 100644
--- a/src/lib/corelib/language/testdata/dummy.txt
+++ b/tests/auto/language/testdata/dummy.txt
diff --git a/src/lib/corelib/language/testdata/environmentvariable.qbs b/tests/auto/language/testdata/environmentvariable.qbs
index 2e04c7991..2e04c7991 100644
--- a/src/lib/corelib/language/testdata/environmentvariable.qbs
+++ b/tests/auto/language/testdata/environmentvariable.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/ParentItem.qbs b/tests/auto/language/testdata/erroneous/ParentItem.qbs
index a5ee03268..a5ee03268 100644
--- a/src/lib/corelib/language/testdata/erroneous/ParentItem.qbs
+++ b/tests/auto/language/testdata/erroneous/ParentItem.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/ParentWithExport.qbs b/tests/auto/language/testdata/erroneous/ParentWithExport.qbs
index 0037d2c0f..0037d2c0f 100644
--- a/src/lib/corelib/language/testdata/erroneous/ParentWithExport.qbs
+++ b/tests/auto/language/testdata/erroneous/ParentWithExport.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/conflicting-properties-in-export-items.qbs b/tests/auto/language/testdata/erroneous/conflicting-properties-in-export-items.qbs
index 021dc786b..021dc786b 100644
--- a/src/lib/corelib/language/testdata/erroneous/conflicting-properties-in-export-items.qbs
+++ b/tests/auto/language/testdata/erroneous/conflicting-properties-in-export-items.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/conflicting_fileTagsFilter.qbs b/tests/auto/language/testdata/erroneous/conflicting_fileTagsFilter.qbs
index 54b3343e4..54b3343e4 100644
--- a/src/lib/corelib/language/testdata/erroneous/conflicting_fileTagsFilter.qbs
+++ b/tests/auto/language/testdata/erroneous/conflicting_fileTagsFilter.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/dependency_cycle.qbs b/tests/auto/language/testdata/erroneous/dependency_cycle.qbs
index dce212d9c..dce212d9c 100644
--- a/src/lib/corelib/language/testdata/erroneous/dependency_cycle.qbs
+++ b/tests/auto/language/testdata/erroneous/dependency_cycle.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/dependency_cycle2.qbs b/tests/auto/language/testdata/erroneous/dependency_cycle2.qbs
index ab7a0d6f4..ab7a0d6f4 100644
--- a/src/lib/corelib/language/testdata/erroneous/dependency_cycle2.qbs
+++ b/tests/auto/language/testdata/erroneous/dependency_cycle2.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/dependency_cycle3.qbs b/tests/auto/language/testdata/erroneous/dependency_cycle3.qbs
index ab1629777..ab1629777 100644
--- a/src/lib/corelib/language/testdata/erroneous/dependency_cycle3.qbs
+++ b/tests/auto/language/testdata/erroneous/dependency_cycle3.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/dependency_cycle4.qbs b/tests/auto/language/testdata/erroneous/dependency_cycle4.qbs
index 5d33a59c6..5d33a59c6 100644
--- a/src/lib/corelib/language/testdata/erroneous/dependency_cycle4.qbs
+++ b/tests/auto/language/testdata/erroneous/dependency_cycle4.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/duplicate_sources.qbs b/tests/auto/language/testdata/erroneous/duplicate_sources.qbs
index 0546ac2e7..0546ac2e7 100644
--- a/src/lib/corelib/language/testdata/erroneous/duplicate_sources.qbs
+++ b/tests/auto/language/testdata/erroneous/duplicate_sources.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/duplicate_sources_wildcards.qbs b/tests/auto/language/testdata/erroneous/duplicate_sources_wildcards.qbs
index a51aa26d1..a51aa26d1 100644
--- a/src/lib/corelib/language/testdata/erroneous/duplicate_sources_wildcards.qbs
+++ b/tests/auto/language/testdata/erroneous/duplicate_sources_wildcards.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/importloop1.qbs b/tests/auto/language/testdata/erroneous/importloop1.qbs
index 91e8f620f..91e8f620f 100644
--- a/src/lib/corelib/language/testdata/erroneous/importloop1.qbs
+++ b/tests/auto/language/testdata/erroneous/importloop1.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/importloop2.qbs b/tests/auto/language/testdata/erroneous/importloop2.qbs
index c41fe7e9f..c41fe7e9f 100644
--- a/src/lib/corelib/language/testdata/erroneous/importloop2.qbs
+++ b/tests/auto/language/testdata/erroneous/importloop2.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/invalid-property-option.qbs b/tests/auto/language/testdata/erroneous/invalid-property-option.qbs
index 6e74faf8a..6e74faf8a 100644
--- a/src/lib/corelib/language/testdata/erroneous/invalid-property-option.qbs
+++ b/tests/auto/language/testdata/erroneous/invalid-property-option.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/invalid_child_item_type.qbs b/tests/auto/language/testdata/erroneous/invalid_child_item_type.qbs
index 2341d4b9c..2341d4b9c 100644
--- a/src/lib/corelib/language/testdata/erroneous/invalid_child_item_type.qbs
+++ b/tests/auto/language/testdata/erroneous/invalid_child_item_type.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/invalid_file.qbs b/tests/auto/language/testdata/erroneous/invalid_file.qbs
index 18f2b044d..18f2b044d 100644
--- a/src/lib/corelib/language/testdata/erroneous/invalid_file.qbs
+++ b/tests/auto/language/testdata/erroneous/invalid_file.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/invalid_property_type.qbs b/tests/auto/language/testdata/erroneous/invalid_property_type.qbs
index b9b392736..b9b392736 100644
--- a/src/lib/corelib/language/testdata/erroneous/invalid_property_type.qbs
+++ b/tests/auto/language/testdata/erroneous/invalid_property_type.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/invalid_stringlist_element.qbs b/tests/auto/language/testdata/erroneous/invalid_stringlist_element.qbs
index fc30a2af6..fc30a2af6 100644
--- a/src/lib/corelib/language/testdata/erroneous/invalid_stringlist_element.qbs
+++ b/tests/auto/language/testdata/erroneous/invalid_stringlist_element.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/main.cpp b/tests/auto/language/testdata/erroneous/main.cpp
index 4fdd63841..4fdd63841 100644
--- a/src/lib/corelib/language/testdata/erroneous/main.cpp
+++ b/tests/auto/language/testdata/erroneous/main.cpp
diff --git a/src/lib/corelib/language/testdata/erroneous/missing-colon.qbs b/tests/auto/language/testdata/erroneous/missing-colon.qbs
index f05a2e6a2..f05a2e6a2 100644
--- a/src/lib/corelib/language/testdata/erroneous/missing-colon.qbs
+++ b/tests/auto/language/testdata/erroneous/missing-colon.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/misused-inherited-property.qbs b/tests/auto/language/testdata/erroneous/misused-inherited-property.qbs
index 37ee04158..37ee04158 100644
--- a/src/lib/corelib/language/testdata/erroneous/misused-inherited-property.qbs
+++ b/tests/auto/language/testdata/erroneous/misused-inherited-property.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/modules/module-a/module-a.qbs b/tests/auto/language/testdata/erroneous/modules/module-a/module-a.qbs
index e0f24191c..e0f24191c 100644
--- a/src/lib/corelib/language/testdata/erroneous/modules/module-a/module-a.qbs
+++ b/tests/auto/language/testdata/erroneous/modules/module-a/module-a.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/modules/module-b/module-b.qbs b/tests/auto/language/testdata/erroneous/modules/module-b/module-b.qbs
index fe3eb2b1e..fe3eb2b1e 100644
--- a/src/lib/corelib/language/testdata/erroneous/modules/module-b/module-b.qbs
+++ b/tests/auto/language/testdata/erroneous/modules/module-b/module-b.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/modules/module-with-wrong-property-option/m.qbs b/tests/auto/language/testdata/erroneous/modules/module-with-wrong-property-option/m.qbs
index 8ea67f2c5..8ea67f2c5 100644
--- a/src/lib/corelib/language/testdata/erroneous/modules/module-with-wrong-property-option/m.qbs
+++ b/tests/auto/language/testdata/erroneous/modules/module-with-wrong-property-option/m.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/modules/prefix1/prefix1.qbs b/tests/auto/language/testdata/erroneous/modules/prefix1/prefix1.qbs
index 3e67ba10d..3e67ba10d 100644
--- a/src/lib/corelib/language/testdata/erroneous/modules/prefix1/prefix1.qbs
+++ b/tests/auto/language/testdata/erroneous/modules/prefix1/prefix1.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/modules/prefix1/suffix/suffix.qbs b/tests/auto/language/testdata/erroneous/modules/prefix1/suffix/suffix.qbs
index 394794769..394794769 100644
--- a/src/lib/corelib/language/testdata/erroneous/modules/prefix1/suffix/suffix.qbs
+++ b/tests/auto/language/testdata/erroneous/modules/prefix1/suffix/suffix.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/modules/prefix2/prefix2.qbs b/tests/auto/language/testdata/erroneous/modules/prefix2/prefix2.qbs
index bda21b8d5..bda21b8d5 100644
--- a/src/lib/corelib/language/testdata/erroneous/modules/prefix2/prefix2.qbs
+++ b/tests/auto/language/testdata/erroneous/modules/prefix2/prefix2.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/modules/prefix2/suffix/suffix.qbs b/tests/auto/language/testdata/erroneous/modules/prefix2/suffix/suffix.qbs
index 3e67ba10d..3e67ba10d 100644
--- a/src/lib/corelib/language/testdata/erroneous/modules/prefix2/suffix/suffix.qbs
+++ b/tests/auto/language/testdata/erroneous/modules/prefix2/suffix/suffix.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/multiple_exports.qbs b/tests/auto/language/testdata/erroneous/multiple_exports.qbs
index 17c7f6a14..17c7f6a14 100644
--- a/src/lib/corelib/language/testdata/erroneous/multiple_exports.qbs
+++ b/tests/auto/language/testdata/erroneous/multiple_exports.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/multiple_properties_in_subproject.qbs b/tests/auto/language/testdata/erroneous/multiple_properties_in_subproject.qbs
index 0ecb41b34..0ecb41b34 100644
--- a/src/lib/corelib/language/testdata/erroneous/multiple_properties_in_subproject.qbs
+++ b/tests/auto/language/testdata/erroneous/multiple_properties_in_subproject.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/nonexistentouter.qbs b/tests/auto/language/testdata/erroneous/nonexistentouter.qbs
index 6c5899b5d..6c5899b5d 100644
--- a/src/lib/corelib/language/testdata/erroneous/nonexistentouter.qbs
+++ b/tests/auto/language/testdata/erroneous/nonexistentouter.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/oldQbsVersion.qbs b/tests/auto/language/testdata/erroneous/oldQbsVersion.qbs
index fb0915d83..fb0915d83 100644
--- a/src/lib/corelib/language/testdata/erroneous/oldQbsVersion.qbs
+++ b/tests/auto/language/testdata/erroneous/oldQbsVersion.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/properties-item-with-invalid-condition.qbs b/tests/auto/language/testdata/erroneous/properties-item-with-invalid-condition.qbs
index 00e3267c2..00e3267c2 100644
--- a/src/lib/corelib/language/testdata/erroneous/properties-item-with-invalid-condition.qbs
+++ b/tests/auto/language/testdata/erroneous/properties-item-with-invalid-condition.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/references_cycle.qbs b/tests/auto/language/testdata/erroneous/references_cycle.qbs
index 6d0960f09..6d0960f09 100644
--- a/src/lib/corelib/language/testdata/erroneous/references_cycle.qbs
+++ b/tests/auto/language/testdata/erroneous/references_cycle.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/references_cycle2.qbs b/tests/auto/language/testdata/erroneous/references_cycle2.qbs
index 0b0d2734d..0b0d2734d 100644
--- a/src/lib/corelib/language/testdata/erroneous/references_cycle2.qbs
+++ b/tests/auto/language/testdata/erroneous/references_cycle2.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/references_cycle3.qbs b/tests/auto/language/testdata/erroneous/references_cycle3.qbs
index 2a237d154..2a237d154 100644
--- a/src/lib/corelib/language/testdata/erroneous/references_cycle3.qbs
+++ b/tests/auto/language/testdata/erroneous/references_cycle3.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/reserved_name_in_import.qbs b/tests/auto/language/testdata/erroneous/reserved_name_in_import.qbs
index 3940109d0..3940109d0 100644
--- a/src/lib/corelib/language/testdata/erroneous/reserved_name_in_import.qbs
+++ b/tests/auto/language/testdata/erroneous/reserved_name_in_import.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/same-module-prefix1.qbs b/tests/auto/language/testdata/erroneous/same-module-prefix1.qbs
index a5275eb15..a5275eb15 100644
--- a/src/lib/corelib/language/testdata/erroneous/same-module-prefix1.qbs
+++ b/tests/auto/language/testdata/erroneous/same-module-prefix1.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/same-module-prefix2.qbs b/tests/auto/language/testdata/erroneous/same-module-prefix2.qbs
index 3c4ec02a4..3c4ec02a4 100644
--- a/src/lib/corelib/language/testdata/erroneous/same-module-prefix2.qbs
+++ b/tests/auto/language/testdata/erroneous/same-module-prefix2.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/subproject_cycle.qbs b/tests/auto/language/testdata/erroneous/subproject_cycle.qbs
index 0a9cd289f..0a9cd289f 100644
--- a/src/lib/corelib/language/testdata/erroneous/subproject_cycle.qbs
+++ b/tests/auto/language/testdata/erroneous/subproject_cycle.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/subproject_cycle2.qbs b/tests/auto/language/testdata/erroneous/subproject_cycle2.qbs
index ab92d76dd..ab92d76dd 100644
--- a/src/lib/corelib/language/testdata/erroneous/subproject_cycle2.qbs
+++ b/tests/auto/language/testdata/erroneous/subproject_cycle2.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/subproject_cycle3.qbs b/tests/auto/language/testdata/erroneous/subproject_cycle3.qbs
index af1e50f5a..af1e50f5a 100644
--- a/src/lib/corelib/language/testdata/erroneous/subproject_cycle3.qbs
+++ b/tests/auto/language/testdata/erroneous/subproject_cycle3.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/throw_in_property_binding.qbs b/tests/auto/language/testdata/erroneous/throw_in_property_binding.qbs
index fc251b1a4..fc251b1a4 100644
--- a/src/lib/corelib/language/testdata/erroneous/throw_in_property_binding.qbs
+++ b/tests/auto/language/testdata/erroneous/throw_in_property_binding.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/undeclared_item.qbs b/tests/auto/language/testdata/erroneous/undeclared_item.qbs
index b2edbf013..b2edbf013 100644
--- a/src/lib/corelib/language/testdata/erroneous/undeclared_item.qbs
+++ b/tests/auto/language/testdata/erroneous/undeclared_item.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/undeclared_property.qbs b/tests/auto/language/testdata/erroneous/undeclared_property.qbs
index 1dad5f747..1dad5f747 100644
--- a/src/lib/corelib/language/testdata/erroneous/undeclared_property.qbs
+++ b/tests/auto/language/testdata/erroneous/undeclared_property.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/undeclared_property_in_Properties_item.qbs b/tests/auto/language/testdata/erroneous/undeclared_property_in_Properties_item.qbs
index d9bd00ce7..d9bd00ce7 100644
--- a/src/lib/corelib/language/testdata/erroneous/undeclared_property_in_Properties_item.qbs
+++ b/tests/auto/language/testdata/erroneous/undeclared_property_in_Properties_item.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/undeclared_property_in_export_item.qbs b/tests/auto/language/testdata/erroneous/undeclared_property_in_export_item.qbs
index e5fc74b74..e5fc74b74 100644
--- a/src/lib/corelib/language/testdata/erroneous/undeclared_property_in_export_item.qbs
+++ b/tests/auto/language/testdata/erroneous/undeclared_property_in_export_item.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/undeclared_property_in_export_item2.qbs b/tests/auto/language/testdata/erroneous/undeclared_property_in_export_item2.qbs
index 1cb4c42ee..1cb4c42ee 100644
--- a/src/lib/corelib/language/testdata/erroneous/undeclared_property_in_export_item2.qbs
+++ b/tests/auto/language/testdata/erroneous/undeclared_property_in_export_item2.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/undeclared_property_in_export_item3.qbs b/tests/auto/language/testdata/erroneous/undeclared_property_in_export_item3.qbs
index cd23aefe4..cd23aefe4 100644
--- a/src/lib/corelib/language/testdata/erroneous/undeclared_property_in_export_item3.qbs
+++ b/tests/auto/language/testdata/erroneous/undeclared_property_in_export_item3.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/undeclared_property_wrapper.qbs b/tests/auto/language/testdata/erroneous/undeclared_property_wrapper.qbs
index ee263ef7f..ee263ef7f 100644
--- a/src/lib/corelib/language/testdata/erroneous/undeclared_property_wrapper.qbs
+++ b/tests/auto/language/testdata/erroneous/undeclared_property_wrapper.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/undefined_stringlist_element.qbs b/tests/auto/language/testdata/erroneous/undefined_stringlist_element.qbs
index 8e33cd763..8e33cd763 100644
--- a/src/lib/corelib/language/testdata/erroneous/undefined_stringlist_element.qbs
+++ b/tests/auto/language/testdata/erroneous/undefined_stringlist_element.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/unknown_item_type.qbs b/tests/auto/language/testdata/erroneous/unknown_item_type.qbs
index 9e34e9243..9e34e9243 100644
--- a/src/lib/corelib/language/testdata/erroneous/unknown_item_type.qbs
+++ b/tests/auto/language/testdata/erroneous/unknown_item_type.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/unknown_module.qbs b/tests/auto/language/testdata/erroneous/unknown_module.qbs
index dcfc79a9c..dcfc79a9c 100644
--- a/src/lib/corelib/language/testdata/erroneous/unknown_module.qbs
+++ b/tests/auto/language/testdata/erroneous/unknown_module.qbs
diff --git a/src/lib/corelib/language/testdata/erroneous/wrongQbsVersionFormat.qbs b/tests/auto/language/testdata/erroneous/wrongQbsVersionFormat.qbs
index 36c9fea7c..36c9fea7c 100644
--- a/src/lib/corelib/language/testdata/erroneous/wrongQbsVersionFormat.qbs
+++ b/tests/auto/language/testdata/erroneous/wrongQbsVersionFormat.qbs
diff --git a/src/lib/corelib/language/testdata/exports.qbs b/tests/auto/language/testdata/exports.qbs
index c480f0097..c480f0097 100644
--- a/src/lib/corelib/language/testdata/exports.qbs
+++ b/tests/auto/language/testdata/exports.qbs
diff --git a/src/lib/corelib/language/testdata/exports_product.qbs b/tests/auto/language/testdata/exports_product.qbs
index 7fd213291..7fd213291 100644
--- a/src/lib/corelib/language/testdata/exports_product.qbs
+++ b/tests/auto/language/testdata/exports_product.qbs
diff --git a/src/lib/corelib/language/testdata/filecontextproperties.qbs b/tests/auto/language/testdata/filecontextproperties.qbs
index 5c435b3ba..5c435b3ba 100644
--- a/src/lib/corelib/language/testdata/filecontextproperties.qbs
+++ b/tests/auto/language/testdata/filecontextproperties.qbs
diff --git a/src/lib/corelib/language/testdata/filetags.qbs b/tests/auto/language/testdata/filetags.qbs
index eb1cf57c6..eb1cf57c6 100644
--- a/src/lib/corelib/language/testdata/filetags.qbs
+++ b/tests/auto/language/testdata/filetags.qbs
diff --git a/src/lib/corelib/language/testdata/getNativeSetting.qbs b/tests/auto/language/testdata/getNativeSetting.qbs
index ab2943499..ab2943499 100644
--- a/src/lib/corelib/language/testdata/getNativeSetting.qbs
+++ b/tests/auto/language/testdata/getNativeSetting.qbs
diff --git a/src/lib/corelib/language/testdata/groupconditions.qbs b/tests/auto/language/testdata/groupconditions.qbs
index 244c80c2c..244c80c2c 100644
--- a/src/lib/corelib/language/testdata/groupconditions.qbs
+++ b/tests/auto/language/testdata/groupconditions.qbs
diff --git a/src/lib/corelib/language/testdata/groupname.qbs b/tests/auto/language/testdata/groupname.qbs
index 22e58765c..22e58765c 100644
--- a/src/lib/corelib/language/testdata/groupname.qbs
+++ b/tests/auto/language/testdata/groupname.qbs
diff --git a/src/lib/corelib/language/testdata/homeDirectory.qbs b/tests/auto/language/testdata/homeDirectory.qbs
index 1ceeb5bbd..1ceeb5bbd 100644
--- a/src/lib/corelib/language/testdata/homeDirectory.qbs
+++ b/tests/auto/language/testdata/homeDirectory.qbs
diff --git a/src/lib/corelib/language/testdata/id-uniqueness.qbs b/tests/auto/language/testdata/id-uniqueness.qbs
index cfbaf8548..cfbaf8548 100644
--- a/src/lib/corelib/language/testdata/id-uniqueness.qbs
+++ b/tests/auto/language/testdata/id-uniqueness.qbs
diff --git a/src/lib/corelib/language/testdata/idusage.qbs b/tests/auto/language/testdata/idusage.qbs
index 42dc43ad5..42dc43ad5 100644
--- a/src/lib/corelib/language/testdata/idusage.qbs
+++ b/tests/auto/language/testdata/idusage.qbs
diff --git a/src/lib/corelib/language/testdata/idusagebase.qbs b/tests/auto/language/testdata/idusagebase.qbs
index 483a00ccf..483a00ccf 100644
--- a/src/lib/corelib/language/testdata/idusagebase.qbs
+++ b/tests/auto/language/testdata/idusagebase.qbs
diff --git a/src/lib/corelib/language/testdata/import-collection/collection/file1.js b/tests/auto/language/testdata/import-collection/collection/file1.js
index 09c5cc75a..09c5cc75a 100644
--- a/src/lib/corelib/language/testdata/import-collection/collection/file1.js
+++ b/tests/auto/language/testdata/import-collection/collection/file1.js
diff --git a/src/lib/corelib/language/testdata/import-collection/collection/file2.js b/tests/auto/language/testdata/import-collection/collection/file2.js
index ecc0f7c63..ecc0f7c63 100644
--- a/src/lib/corelib/language/testdata/import-collection/collection/file2.js
+++ b/tests/auto/language/testdata/import-collection/collection/file2.js
diff --git a/src/lib/corelib/language/testdata/import-collection/imports/Collection/file1.js b/tests/auto/language/testdata/import-collection/imports/Collection/file1.js
index d305c5284..d305c5284 100644
--- a/src/lib/corelib/language/testdata/import-collection/imports/Collection/file1.js
+++ b/tests/auto/language/testdata/import-collection/imports/Collection/file1.js
diff --git a/src/lib/corelib/language/testdata/import-collection/imports/Collection/file2.js b/tests/auto/language/testdata/import-collection/imports/Collection/file2.js
index b35168227..b35168227 100644
--- a/src/lib/corelib/language/testdata/import-collection/imports/Collection/file2.js
+++ b/tests/auto/language/testdata/import-collection/imports/Collection/file2.js
diff --git a/src/lib/corelib/language/testdata/import-collection/product.qbs b/tests/auto/language/testdata/import-collection/product.qbs
index 0682fcfab..0682fcfab 100644
--- a/src/lib/corelib/language/testdata/import-collection/product.qbs
+++ b/tests/auto/language/testdata/import-collection/product.qbs
diff --git a/src/lib/corelib/language/testdata/import-collection/project.qbs b/tests/auto/language/testdata/import-collection/project.qbs
index ee34869b4..ee34869b4 100644
--- a/src/lib/corelib/language/testdata/import-collection/project.qbs
+++ b/tests/auto/language/testdata/import-collection/project.qbs
diff --git a/src/lib/corelib/language/testdata/invalidBindingInDisabledItem.qbs b/tests/auto/language/testdata/invalidBindingInDisabledItem.qbs
index e3e03a319..e3e03a319 100644
--- a/src/lib/corelib/language/testdata/invalidBindingInDisabledItem.qbs
+++ b/tests/auto/language/testdata/invalidBindingInDisabledItem.qbs
diff --git a/src/lib/corelib/language/testdata/jsextensions.js b/tests/auto/language/testdata/jsextensions.js
index df74a263b..df74a263b 100644
--- a/src/lib/corelib/language/testdata/jsextensions.js
+++ b/tests/auto/language/testdata/jsextensions.js
diff --git a/src/lib/corelib/language/testdata/jsimportsinmultiplescopes.js b/tests/auto/language/testdata/jsimportsinmultiplescopes.js
index 4e939505c..4e939505c 100644
--- a/src/lib/corelib/language/testdata/jsimportsinmultiplescopes.js
+++ b/tests/auto/language/testdata/jsimportsinmultiplescopes.js
diff --git a/src/lib/corelib/language/testdata/jsimportsinmultiplescopes.qbs b/tests/auto/language/testdata/jsimportsinmultiplescopes.qbs
index 388cf974b..388cf974b 100644
--- a/src/lib/corelib/language/testdata/jsimportsinmultiplescopes.qbs
+++ b/tests/auto/language/testdata/jsimportsinmultiplescopes.qbs
diff --git a/src/lib/corelib/language/testdata/main.cpp b/tests/auto/language/testdata/main.cpp
index e69de29bb..e69de29bb 100644
--- a/src/lib/corelib/language/testdata/main.cpp
+++ b/tests/auto/language/testdata/main.cpp
diff --git a/src/lib/corelib/language/testdata/moduleproperties.qbs b/tests/auto/language/testdata/moduleproperties.qbs
index 16fe2ea74..16fe2ea74 100644
--- a/src/lib/corelib/language/testdata/moduleproperties.qbs
+++ b/tests/auto/language/testdata/moduleproperties.qbs
diff --git a/src/lib/corelib/language/testdata/modulepropertiesingroups.qbs b/tests/auto/language/testdata/modulepropertiesingroups.qbs
index 7a0a99b3e..7a0a99b3e 100644
--- a/src/lib/corelib/language/testdata/modulepropertiesingroups.qbs
+++ b/tests/auto/language/testdata/modulepropertiesingroups.qbs
diff --git a/src/lib/corelib/language/testdata/modules.qbs b/tests/auto/language/testdata/modules.qbs
index c95916319..c95916319 100644
--- a/src/lib/corelib/language/testdata/modules.qbs
+++ b/tests/auto/language/testdata/modules.qbs
diff --git a/src/lib/corelib/language/testdata/modules/deepdummy/deep/moat/dummydeepmoat.qbs b/tests/auto/language/testdata/modules/deepdummy/deep/moat/dummydeepmoat.qbs
index 3383d69e2..3383d69e2 100644
--- a/src/lib/corelib/language/testdata/modules/deepdummy/deep/moat/dummydeepmoat.qbs
+++ b/tests/auto/language/testdata/modules/deepdummy/deep/moat/dummydeepmoat.qbs
diff --git a/src/lib/corelib/language/testdata/modules/dummy/dummy.qbs b/tests/auto/language/testdata/modules/dummy/dummy.qbs
index 8a235555a..8a235555a 100644
--- a/src/lib/corelib/language/testdata/modules/dummy/dummy.qbs
+++ b/tests/auto/language/testdata/modules/dummy/dummy.qbs
diff --git a/src/lib/corelib/language/testdata/modules/dummy/dummy_base.qbs b/tests/auto/language/testdata/modules/dummy/dummy_base.qbs
index 0ecd8a1d8..0ecd8a1d8 100644
--- a/src/lib/corelib/language/testdata/modules/dummy/dummy_base.qbs
+++ b/tests/auto/language/testdata/modules/dummy/dummy_base.qbs
diff --git a/src/lib/corelib/language/testdata/modules/dummy2/dummy2.qbs b/tests/auto/language/testdata/modules/dummy2/dummy2.qbs
index f60c38a71..f60c38a71 100644
--- a/src/lib/corelib/language/testdata/modules/dummy2/dummy2.qbs
+++ b/tests/auto/language/testdata/modules/dummy2/dummy2.qbs
diff --git a/src/lib/corelib/language/testdata/modules/dummyqt/core/dummycore.qbs b/tests/auto/language/testdata/modules/dummyqt/core/dummycore.qbs
index e87bb27ff..e87bb27ff 100644
--- a/src/lib/corelib/language/testdata/modules/dummyqt/core/dummycore.qbs
+++ b/tests/auto/language/testdata/modules/dummyqt/core/dummycore.qbs
diff --git a/src/lib/corelib/language/testdata/modules/dummyqt/gui/dummygui.qbs b/tests/auto/language/testdata/modules/dummyqt/gui/dummygui.qbs
index 52dc82d23..52dc82d23 100644
--- a/src/lib/corelib/language/testdata/modules/dummyqt/gui/dummygui.qbs
+++ b/tests/auto/language/testdata/modules/dummyqt/gui/dummygui.qbs
diff --git a/src/lib/corelib/language/testdata/modules/dummyqt/network/dummynetwork.qbs b/tests/auto/language/testdata/modules/dummyqt/network/dummynetwork.qbs
index 2da3af050..2da3af050 100644
--- a/src/lib/corelib/language/testdata/modules/dummyqt/network/dummynetwork.qbs
+++ b/tests/auto/language/testdata/modules/dummyqt/network/dummynetwork.qbs
diff --git a/src/lib/corelib/language/testdata/modules/gmod/gmod1/gmod1.qbs b/tests/auto/language/testdata/modules/gmod/gmod1/gmod1.qbs
index d3bb92fff..d3bb92fff 100644
--- a/src/lib/corelib/language/testdata/modules/gmod/gmod1/gmod1.qbs
+++ b/tests/auto/language/testdata/modules/gmod/gmod1/gmod1.qbs
diff --git a/src/lib/corelib/language/testdata/modules/gmod2/gmod2.qbs b/tests/auto/language/testdata/modules/gmod2/gmod2.qbs
index e221f50b2..e221f50b2 100644
--- a/src/lib/corelib/language/testdata/modules/gmod2/gmod2.qbs
+++ b/tests/auto/language/testdata/modules/gmod2/gmod2.qbs
diff --git a/src/lib/corelib/language/testdata/modules/gmod3/qmod3.qbs b/tests/auto/language/testdata/modules/gmod3/qmod3.qbs
index 1c8704b5d..1c8704b5d 100644
--- a/src/lib/corelib/language/testdata/modules/gmod3/qmod3.qbs
+++ b/tests/auto/language/testdata/modules/gmod3/qmod3.qbs
diff --git a/src/lib/corelib/language/testdata/modules/gmod4/gmod4.qbs b/tests/auto/language/testdata/modules/gmod4/gmod4.qbs
index c06f4e965..c06f4e965 100644
--- a/src/lib/corelib/language/testdata/modules/gmod4/gmod4.qbs
+++ b/tests/auto/language/testdata/modules/gmod4/gmod4.qbs
diff --git a/src/lib/corelib/language/testdata/modules/scopemod/scopemod.qbs b/tests/auto/language/testdata/modules/scopemod/scopemod.qbs
index ba7dbcbf0..ba7dbcbf0 100644
--- a/src/lib/corelib/language/testdata/modules/scopemod/scopemod.qbs
+++ b/tests/auto/language/testdata/modules/scopemod/scopemod.qbs
diff --git a/src/lib/corelib/language/testdata/modulescope.qbs b/tests/auto/language/testdata/modulescope.qbs
index c127f0c61..c127f0c61 100644
--- a/src/lib/corelib/language/testdata/modulescope.qbs
+++ b/tests/auto/language/testdata/modulescope.qbs
diff --git a/src/lib/corelib/language/testdata/modulescope_base.qbs b/tests/auto/language/testdata/modulescope_base.qbs
index 16a9875fa..16a9875fa 100644
--- a/src/lib/corelib/language/testdata/modulescope_base.qbs
+++ b/tests/auto/language/testdata/modulescope_base.qbs
diff --git a/src/lib/corelib/language/testdata/narf b/tests/auto/language/testdata/narf
index e69de29bb..e69de29bb 100644
--- a/src/lib/corelib/language/testdata/narf
+++ b/tests/auto/language/testdata/narf
diff --git a/src/lib/corelib/language/testdata/narf.zort b/tests/auto/language/testdata/narf.zort
index e69de29bb..e69de29bb 100644
--- a/src/lib/corelib/language/testdata/narf.zort
+++ b/tests/auto/language/testdata/narf.zort
diff --git a/src/lib/corelib/language/testdata/nativesettings.ini b/tests/auto/language/testdata/nativesettings.ini
index 4caf32e56..4caf32e56 100644
--- a/src/lib/corelib/language/testdata/nativesettings.ini
+++ b/tests/auto/language/testdata/nativesettings.ini
diff --git a/src/lib/corelib/language/testdata/non-required-products.qbs b/tests/auto/language/testdata/non-required-products.qbs
index fb21e609e..fb21e609e 100644
--- a/src/lib/corelib/language/testdata/non-required-products.qbs
+++ b/tests/auto/language/testdata/non-required-products.qbs
diff --git a/src/lib/corelib/language/testdata/outerInGroup.qbs b/tests/auto/language/testdata/outerInGroup.qbs
index 751392a4d..751392a4d 100644
--- a/src/lib/corelib/language/testdata/outerInGroup.qbs
+++ b/tests/auto/language/testdata/outerInGroup.qbs
diff --git a/src/lib/corelib/language/testdata/pathproperties.qbs b/tests/auto/language/testdata/pathproperties.qbs
index f0eeabf57..f0eeabf57 100644
--- a/src/lib/corelib/language/testdata/pathproperties.qbs
+++ b/tests/auto/language/testdata/pathproperties.qbs
diff --git a/src/lib/corelib/language/testdata/productconditions.qbs b/tests/auto/language/testdata/productconditions.qbs
index e815cc88e..e815cc88e 100644
--- a/src/lib/corelib/language/testdata/productconditions.qbs
+++ b/tests/auto/language/testdata/productconditions.qbs
diff --git a/src/lib/corelib/language/testdata/productdirectories.qbs b/tests/auto/language/testdata/productdirectories.qbs
index dc4315207..dc4315207 100644
--- a/src/lib/corelib/language/testdata/productdirectories.qbs
+++ b/tests/auto/language/testdata/productdirectories.qbs
diff --git a/src/lib/corelib/language/testdata/profilevaluesandoverriddenvalues.qbs b/tests/auto/language/testdata/profilevaluesandoverriddenvalues.qbs
index 156f9f1bb..156f9f1bb 100644
--- a/src/lib/corelib/language/testdata/profilevaluesandoverriddenvalues.qbs
+++ b/tests/auto/language/testdata/profilevaluesandoverriddenvalues.qbs
diff --git a/src/lib/corelib/language/testdata/properties-block-in-group.qbs b/tests/auto/language/testdata/properties-block-in-group.qbs
index c2bfea0a8..c2bfea0a8 100644
--- a/src/lib/corelib/language/testdata/properties-block-in-group.qbs
+++ b/tests/auto/language/testdata/properties-block-in-group.qbs
diff --git a/src/lib/corelib/language/testdata/propertiesblocks.qbs b/tests/auto/language/testdata/propertiesblocks.qbs
index db1054f0a..db1054f0a 100644
--- a/src/lib/corelib/language/testdata/propertiesblocks.qbs
+++ b/tests/auto/language/testdata/propertiesblocks.qbs
diff --git a/src/lib/corelib/language/testdata/propertiesblocks_base.qbs b/tests/auto/language/testdata/propertiesblocks_base.qbs
index 71b09a3da..71b09a3da 100644
--- a/src/lib/corelib/language/testdata/propertiesblocks_base.qbs
+++ b/tests/auto/language/testdata/propertiesblocks_base.qbs
diff --git a/src/lib/corelib/language/testdata/qbs-properties-in-project-condition.qbs b/tests/auto/language/testdata/qbs-properties-in-project-condition.qbs
index d3aa2d2ad..d3aa2d2ad 100644
--- a/src/lib/corelib/language/testdata/qbs-properties-in-project-condition.qbs
+++ b/tests/auto/language/testdata/qbs-properties-in-project-condition.qbs
diff --git a/src/lib/corelib/language/testdata/recursive-dependencies/recursive-dependencies.qbs b/tests/auto/language/testdata/recursive-dependencies/recursive-dependencies.qbs
index 34d7089d3..34d7089d3 100644
--- a/src/lib/corelib/language/testdata/recursive-dependencies/recursive-dependencies.qbs
+++ b/tests/auto/language/testdata/recursive-dependencies/recursive-dependencies.qbs
diff --git a/src/lib/corelib/language/testdata/relaxed-error-mode/file1.txt b/tests/auto/language/testdata/relaxed-error-mode/file1.txt
index e69de29bb..e69de29bb 100644
--- a/src/lib/corelib/language/testdata/relaxed-error-mode/file1.txt
+++ b/tests/auto/language/testdata/relaxed-error-mode/file1.txt
diff --git a/src/lib/corelib/language/testdata/relaxed-error-mode/file2.txt b/tests/auto/language/testdata/relaxed-error-mode/file2.txt
index e69de29bb..e69de29bb 100644
--- a/src/lib/corelib/language/testdata/relaxed-error-mode/file2.txt
+++ b/tests/auto/language/testdata/relaxed-error-mode/file2.txt
diff --git a/src/lib/corelib/language/testdata/relaxed-error-mode/relaxed-error-mode.qbs b/tests/auto/language/testdata/relaxed-error-mode/relaxed-error-mode.qbs
index fa6190ca4..fa6190ca4 100644
--- a/src/lib/corelib/language/testdata/relaxed-error-mode/relaxed-error-mode.qbs
+++ b/tests/auto/language/testdata/relaxed-error-mode/relaxed-error-mode.qbs
diff --git a/src/lib/corelib/language/testdata/required-and-nonrequired-dependencies/complicated.qbs b/tests/auto/language/testdata/required-and-nonrequired-dependencies/complicated.qbs
index 2173948f9..2173948f9 100644
--- a/src/lib/corelib/language/testdata/required-and-nonrequired-dependencies/complicated.qbs
+++ b/tests/auto/language/testdata/required-and-nonrequired-dependencies/complicated.qbs
diff --git a/src/lib/corelib/language/testdata/required-and-nonrequired-dependencies/dependency-via-export.qbs b/tests/auto/language/testdata/required-and-nonrequired-dependencies/dependency-via-export.qbs
index a4de65cbe..a4de65cbe 100644
--- a/src/lib/corelib/language/testdata/required-and-nonrequired-dependencies/dependency-via-export.qbs
+++ b/tests/auto/language/testdata/required-and-nonrequired-dependencies/dependency-via-export.qbs
diff --git a/src/lib/corelib/language/testdata/required-and-nonrequired-dependencies/dependency-via-module.qbs b/tests/auto/language/testdata/required-and-nonrequired-dependencies/dependency-via-module.qbs
index 74ab675e3..74ab675e3 100644
--- a/src/lib/corelib/language/testdata/required-and-nonrequired-dependencies/dependency-via-module.qbs
+++ b/tests/auto/language/testdata/required-and-nonrequired-dependencies/dependency-via-module.qbs
diff --git a/src/lib/corelib/language/testdata/required-and-nonrequired-dependencies/direct-dependencies.qbs b/tests/auto/language/testdata/required-and-nonrequired-dependencies/direct-dependencies.qbs
index cf2f0f245..cf2f0f245 100644
--- a/src/lib/corelib/language/testdata/required-and-nonrequired-dependencies/direct-dependencies.qbs
+++ b/tests/auto/language/testdata/required-and-nonrequired-dependencies/direct-dependencies.qbs
diff --git a/src/lib/corelib/language/testdata/required-and-nonrequired-dependencies/modules/failing-validation-indirect/failing-validation-indirect.qbs b/tests/auto/language/testdata/required-and-nonrequired-dependencies/modules/failing-validation-indirect/failing-validation-indirect.qbs
index 45613b584..45613b584 100644
--- a/src/lib/corelib/language/testdata/required-and-nonrequired-dependencies/modules/failing-validation-indirect/failing-validation-indirect.qbs
+++ b/tests/auto/language/testdata/required-and-nonrequired-dependencies/modules/failing-validation-indirect/failing-validation-indirect.qbs
diff --git a/src/lib/corelib/language/testdata/required-and-nonrequired-dependencies/modules/failing-validation/failing-validation.qbs b/tests/auto/language/testdata/required-and-nonrequired-dependencies/modules/failing-validation/failing-validation.qbs
index dcc650b93..dcc650b93 100644
--- a/src/lib/corelib/language/testdata/required-and-nonrequired-dependencies/modules/failing-validation/failing-validation.qbs
+++ b/tests/auto/language/testdata/required-and-nonrequired-dependencies/modules/failing-validation/failing-validation.qbs
diff --git a/src/lib/corelib/language/testdata/required-and-nonrequired-dependencies/required-chain-export-indirect.qbs b/tests/auto/language/testdata/required-and-nonrequired-dependencies/required-chain-export-indirect.qbs
index 293f737c0..293f737c0 100644
--- a/src/lib/corelib/language/testdata/required-and-nonrequired-dependencies/required-chain-export-indirect.qbs
+++ b/tests/auto/language/testdata/required-and-nonrequired-dependencies/required-chain-export-indirect.qbs
diff --git a/src/lib/corelib/language/testdata/required-and-nonrequired-dependencies/required-chain-export.qbs b/tests/auto/language/testdata/required-and-nonrequired-dependencies/required-chain-export.qbs
index 6f2ec5566..6f2ec5566 100644
--- a/src/lib/corelib/language/testdata/required-and-nonrequired-dependencies/required-chain-export.qbs
+++ b/tests/auto/language/testdata/required-and-nonrequired-dependencies/required-chain-export.qbs
diff --git a/src/lib/corelib/language/testdata/required-and-nonrequired-dependencies/required-chain-module.qbs b/tests/auto/language/testdata/required-and-nonrequired-dependencies/required-chain-module.qbs
index ecc800e7b..ecc800e7b 100644
--- a/src/lib/corelib/language/testdata/required-and-nonrequired-dependencies/required-chain-module.qbs
+++ b/tests/auto/language/testdata/required-and-nonrequired-dependencies/required-chain-module.qbs
diff --git a/src/lib/corelib/language/testdata/rfc1034identifier.qbs b/tests/auto/language/testdata/rfc1034identifier.qbs
index eb73dc4d6..eb73dc4d6 100644
--- a/src/lib/corelib/language/testdata/rfc1034identifier.qbs
+++ b/tests/auto/language/testdata/rfc1034identifier.qbs
diff --git a/src/lib/corelib/language/testdata/subdir/exports-mylib.qbs b/tests/auto/language/testdata/subdir/exports-mylib.qbs
index e3802de50..e3802de50 100644
--- a/src/lib/corelib/language/testdata/subdir/exports-mylib.qbs
+++ b/tests/auto/language/testdata/subdir/exports-mylib.qbs
diff --git a/src/lib/corelib/language/testdata/subdir/pathproperties_base.qbs b/tests/auto/language/testdata/subdir/pathproperties_base.qbs
index 62427169f..62427169f 100644
--- a/src/lib/corelib/language/testdata/subdir/pathproperties_base.qbs
+++ b/tests/auto/language/testdata/subdir/pathproperties_base.qbs
diff --git a/src/lib/corelib/language/testdata/subdir2/exports-mylib2.qbs b/tests/auto/language/testdata/subdir2/exports-mylib2.qbs
index a0cec6eb0..a0cec6eb0 100644
--- a/src/lib/corelib/language/testdata/subdir2/exports-mylib2.qbs
+++ b/tests/auto/language/testdata/subdir2/exports-mylib2.qbs
diff --git a/src/lib/corelib/language/testdata/throwing-probe.qbs b/tests/auto/language/testdata/throwing-probe.qbs
index 1fe059828..1fe059828 100644
--- a/src/lib/corelib/language/testdata/throwing-probe.qbs
+++ b/tests/auto/language/testdata/throwing-probe.qbs
diff --git a/src/lib/corelib/language/testdata/versionCompare.qbs b/tests/auto/language/testdata/versionCompare.qbs
index 0a7271d14..0a7271d14 100644
--- a/src/lib/corelib/language/testdata/versionCompare.qbs
+++ b/tests/auto/language/testdata/versionCompare.qbs
diff --git a/src/lib/corelib/language/testdata/zort b/tests/auto/language/testdata/zort
index e69de29bb..e69de29bb 100644
--- a/src/lib/corelib/language/testdata/zort
+++ b/tests/auto/language/testdata/zort