Remove the base module import from most test data projects

Keep the base import in blackbox/testdata/deprecated-property to ensure
we don't accidentally break it.

Change-Id: I790da21a7490ec9c1b0335f45e8707e7e04daa7c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

160 files changed, 16 insertions, 320 deletions

diff --git a/tests/auto/language/testdata/MyProperties.qbs b/tests/auto/language/testdata/MyProperties.qbs
index b29bfc18f..cca5a9c9a 100644
--- a/tests/auto/language/testdata/MyProperties.qbs
+++ b/tests/auto/language/testdata/MyProperties.qbs
@@ -1,4 +1,2 @@
-import qbs
-
 Properties {
 }
diff --git a/tests/auto/language/testdata/additional-product-types.qbs b/tests/auto/language/testdata/additional-product-types.qbs
index af510bed7..686650f42 100644
--- a/tests/auto/language/testdata/additional-product-types.qbs
+++ b/tests/auto/language/testdata/additional-product-types.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     name: "p"
     type: ["tag1"]
diff --git a/tests/auto/language/testdata/base-validate/base-validate.qbs b/tests/auto/language/testdata/base-validate/base-validate.qbs
index b1b025f94..657917739 100644
--- a/tests/auto/language/testdata/base-validate/base-validate.qbs
+++ b/tests/auto/language/testdata/base-validate/base-validate.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     Depends { name: "m" }
 }
diff --git a/tests/auto/language/testdata/base-validate/modules/m/MParent.qbs b/tests/auto/language/testdata/base-validate/modules/m/MParent.qbs
index 9874fbd5d..8b147cfa5 100644
--- a/tests/auto/language/testdata/base-validate/modules/m/MParent.qbs
+++ b/tests/auto/language/testdata/base-validate/modules/m/MParent.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     condition: false
     validate: true
diff --git a/tests/auto/language/testdata/base-validate/modules/m/m.qbs b/tests/auto/language/testdata/base-validate/modules/m/m.qbs
index 6fcdc9ebc..6fca37adc 100644
--- a/tests/auto/language/testdata/base-validate/modules/m/m.qbs
+++ b/tests/auto/language/testdata/base-validate/modules/m/m.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 MParent {
     condition: true
     validate: {
diff --git a/tests/auto/language/testdata/broken-dependency-cycle1.qbs b/tests/auto/language/testdata/broken-dependency-cycle1.qbs
index d23e5b459..aef4eb588 100644
--- a/tests/auto/language/testdata/broken-dependency-cycle1.qbs
+++ b/tests/auto/language/testdata/broken-dependency-cycle1.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         name: "p1"
diff --git a/tests/auto/language/testdata/broken-dependency-cycle2.qbs b/tests/auto/language/testdata/broken-dependency-cycle2.qbs
index f0c6e4f57..69a6e4f85 100644
--- a/tests/auto/language/testdata/broken-dependency-cycle2.qbs
+++ b/tests/auto/language/testdata/broken-dependency-cycle2.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         name: "p1"
diff --git a/tests/auto/language/testdata/builtinFunctionInSearchPathsProperty.qbs b/tests/auto/language/testdata/builtinFunctionInSearchPathsProperty.qbs
index 0df9f4d5c..50ff29142 100644
--- a/tests/auto/language/testdata/builtinFunctionInSearchPathsProperty.qbs
+++ b/tests/auto/language/testdata/builtinFunctionInSearchPathsProperty.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.Environment
 
 Project {
diff --git a/tests/auto/language/testdata/canonicalArchitecture.qbs b/tests/auto/language/testdata/canonicalArchitecture.qbs
index 16c040ba0..4f548251b 100644
--- a/tests/auto/language/testdata/canonicalArchitecture.qbs
+++ b/tests/auto/language/testdata/canonicalArchitecture.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.Utilities
 
 Product {
diff --git a/tests/auto/language/testdata/chained-probes/chained-probes.qbs b/tests/auto/language/testdata/chained-probes/chained-probes.qbs
index b1b025f94..657917739 100644
--- a/tests/auto/language/testdata/chained-probes/chained-probes.qbs
+++ b/tests/auto/language/testdata/chained-probes/chained-probes.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     Depends { name: "m" }
 }
diff --git a/tests/auto/language/testdata/chained-probes/modules/m/m.qbs b/tests/auto/language/testdata/chained-probes/modules/m/m.qbs
index cf7ab16c7..3c6bcd1c9 100644
--- a/tests/auto/language/testdata/chained-probes/modules/m/m.qbs
+++ b/tests/auto/language/testdata/chained-probes/modules/m/m.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Probe {
         id: probe1
diff --git a/tests/auto/language/testdata/conditionaldepends.qbs b/tests/auto/language/testdata/conditionaldepends.qbs
index e61888c9d..9a499da92 100644
--- a/tests/auto/language/testdata/conditionaldepends.qbs
+++ b/tests/auto/language/testdata/conditionaldepends.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import "conditionaldepends_base.qbs" as CondBase
 
 Project {
diff --git a/tests/auto/language/testdata/conditionaldepends_base.qbs b/tests/auto/language/testdata/conditionaldepends_base.qbs
index 81782ba44..5ab5b973a 100644
--- a/tests/auto/language/testdata/conditionaldepends_base.qbs
+++ b/tests/auto/language/testdata/conditionaldepends_base.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Application {
     name: 'conditionaldepends_base'
     property bool someProp: false
diff --git a/tests/auto/language/testdata/defaultvalue/egon.qbs b/tests/auto/language/testdata/defaultvalue/egon.qbs
index 7b254b0c8..6313e080a 100644
--- a/tests/auto/language/testdata/defaultvalue/egon.qbs
+++ b/tests/auto/language/testdata/defaultvalue/egon.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         name: "dep"
diff --git a/tests/auto/language/testdata/defaultvalue/modules/higher/higher.qbs b/tests/auto/language/testdata/defaultvalue/modules/higher/higher.qbs
index 9894f80cf..6639b811a 100644
--- a/tests/auto/language/testdata/defaultvalue/modules/higher/higher.qbs
+++ b/tests/auto/language/testdata/defaultvalue/modules/higher/higher.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "lower" }
     lower.prop2: lower.prop1 === "egon" ? "withEgon" : original
diff --git a/tests/auto/language/testdata/defaultvalue/modules/lower/lower.qbs b/tests/auto/language/testdata/defaultvalue/modules/lower/lower.qbs
index 0540185e9..72cb23011 100644
--- a/tests/auto/language/testdata/defaultvalue/modules/lower/lower.qbs
+++ b/tests/auto/language/testdata/defaultvalue/modules/lower/lower.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     property string prop1
     property string prop2: prop1 === "blubb" ? "withBlubb" : "withoutBlubb"
diff --git a/tests/auto/language/testdata/delayed-error/modules/m/m.qbs b/tests/auto/language/testdata/delayed-error/modules/m/m.qbs
index 8529f47a4..4b562806b 100644
--- a/tests/auto/language/testdata/delayed-error/modules/m/m.qbs
+++ b/tests/auto/language/testdata/delayed-error/modules/m/m.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     validate: { throw "Validation error!"; }
 }
diff --git a/tests/auto/language/testdata/delayed-error/nonexisting.qbs b/tests/auto/language/testdata/delayed-error/nonexisting.qbs
index 3825146c6..4034b7b94 100644
--- a/tests/auto/language/testdata/delayed-error/nonexisting.qbs
+++ b/tests/auto/language/testdata/delayed-error/nonexisting.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     property bool enableProduct: true
     Product {
diff --git a/tests/auto/language/testdata/delayed-error/validation.qbs b/tests/auto/language/testdata/delayed-error/validation.qbs
index e78c1d9e8..ee9fe05a5 100644
--- a/tests/auto/language/testdata/delayed-error/validation.qbs
+++ b/tests/auto/language/testdata/delayed-error/validation.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     property bool enableProduct: true
     Product {
diff --git a/tests/auto/language/testdata/dependencyOnAllProfiles.qbs b/tests/auto/language/testdata/dependencyOnAllProfiles.qbs
index f0ca56a8a..314a31166 100644
--- a/tests/auto/language/testdata/dependencyOnAllProfiles.qbs
+++ b/tests/auto/language/testdata/dependencyOnAllProfiles.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     property string profile1
     property string profile2
diff --git a/tests/auto/language/testdata/derived-sub-project/DerivedSubProject.qbs b/tests/auto/language/testdata/derived-sub-project/DerivedSubProject.qbs
index 313e04f24..391f56140 100644
--- a/tests/auto/language/testdata/derived-sub-project/DerivedSubProject.qbs
+++ b/tests/auto/language/testdata/derived-sub-project/DerivedSubProject.qbs
@@ -1,4 +1,2 @@
-import qbs
-
 SubProject {
 }
diff --git a/tests/auto/language/testdata/derived-sub-project/project.qbs b/tests/auto/language/testdata/derived-sub-project/project.qbs
index 1aadd92ae..f001b422b 100644
--- a/tests/auto/language/testdata/derived-sub-project/project.qbs
+++ b/tests/auto/language/testdata/derived-sub-project/project.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     DerivedSubProject {
         filePath: "subproject.qbs"
diff --git a/tests/auto/language/testdata/derived-sub-project/subproject.qbs b/tests/auto/language/testdata/derived-sub-project/subproject.qbs
index 18dc695f3..bdef20fd8 100644
--- a/tests/auto/language/testdata/derived-sub-project/subproject.qbs
+++ b/tests/auto/language/testdata/derived-sub-project/subproject.qbs
@@ -1,4 +1,2 @@
-import qbs
-
 Product {
 }
diff --git a/tests/auto/language/testdata/disabled-subproject.qbs b/tests/auto/language/testdata/disabled-subproject.qbs
index 3074e5090..41891ef89 100644
--- a/tests/auto/language/testdata/disabled-subproject.qbs
+++ b/tests/auto/language/testdata/disabled-subproject.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     SubProject {
         condition: false
diff --git a/tests/auto/language/testdata/enum-project-props.qbs b/tests/auto/language/testdata/enum-project-props.qbs
index 185ab7c28..8e2927ab7 100644
--- a/tests/auto/language/testdata/enum-project-props.qbs
+++ b/tests/auto/language/testdata/enum-project-props.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     property string anExistingFile: "dummy.txt"
     Product {
diff --git a/tests/auto/language/testdata/erroneous/ParentItem.qbs b/tests/auto/language/testdata/erroneous/ParentItem.qbs
index b90756678..38cee2642 100644
--- a/tests/auto/language/testdata/erroneous/ParentItem.qbs
+++ b/tests/auto/language/testdata/erroneous/ParentItem.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     property bool cpp
     readonly property string readOnlyString: "I cannot be changed!"
diff --git a/tests/auto/language/testdata/erroneous/ParentWithExport.qbs b/tests/auto/language/testdata/erroneous/ParentWithExport.qbs
index 0037d2c0f..d9ed02478 100644
--- a/tests/auto/language/testdata/erroneous/ParentWithExport.qbs
+++ b/tests/auto/language/testdata/erroneous/ParentWithExport.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     Export {
         property bool theProp
diff --git a/tests/auto/language/testdata/erroneous/conflicting-module-instances.qbs b/tests/auto/language/testdata/erroneous/conflicting-module-instances.qbs
index 28033b174..62a08f028 100644
--- a/tests/auto/language/testdata/erroneous/conflicting-module-instances.qbs
+++ b/tests/auto/language/testdata/erroneous/conflicting-module-instances.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     Depends { name: "conflicting-instances" }
 }
diff --git a/tests/auto/language/testdata/erroneous/conflicting-properties-in-export-items.qbs b/tests/auto/language/testdata/erroneous/conflicting-properties-in-export-items.qbs
index 021dc786b..309d1b4ff 100644
--- a/tests/auto/language/testdata/erroneous/conflicting-properties-in-export-items.qbs
+++ b/tests/auto/language/testdata/erroneous/conflicting-properties-in-export-items.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 ParentWithExport {
     Export {
         property string theProp
diff --git a/tests/auto/language/testdata/erroneous/conflicting_fileTagsFilter.qbs b/tests/auto/language/testdata/erroneous/conflicting_fileTagsFilter.qbs
index 54b3343e4..97e11bb9b 100644
--- a/tests/auto/language/testdata/erroneous/conflicting_fileTagsFilter.qbs
+++ b/tests/auto/language/testdata/erroneous/conflicting_fileTagsFilter.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Application {
     Group {
         fileTagsFilter: "application"
diff --git a/tests/auto/language/testdata/erroneous/dependency_cycle.qbs b/tests/auto/language/testdata/erroneous/dependency_cycle.qbs
index dce212d9c..83a6e35f6 100644
--- a/tests/auto/language/testdata/erroneous/dependency_cycle.qbs
+++ b/tests/auto/language/testdata/erroneous/dependency_cycle.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     CppApplication {
         name: "A"
diff --git a/tests/auto/language/testdata/erroneous/dependency_cycle2.qbs b/tests/auto/language/testdata/erroneous/dependency_cycle2.qbs
index ab7a0d6f4..335355480 100644
--- a/tests/auto/language/testdata/erroneous/dependency_cycle2.qbs
+++ b/tests/auto/language/testdata/erroneous/dependency_cycle2.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     CppApplication {
         name: "A"
diff --git a/tests/auto/language/testdata/erroneous/dependency_cycle3.qbs b/tests/auto/language/testdata/erroneous/dependency_cycle3.qbs
index ab1629777..3297d5f5a 100644
--- a/tests/auto/language/testdata/erroneous/dependency_cycle3.qbs
+++ b/tests/auto/language/testdata/erroneous/dependency_cycle3.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         type: ["a"]
diff --git a/tests/auto/language/testdata/erroneous/dependency_cycle4.qbs b/tests/auto/language/testdata/erroneous/dependency_cycle4.qbs
index 5d33a59c6..bd3a9feb1 100644
--- a/tests/auto/language/testdata/erroneous/dependency_cycle4.qbs
+++ b/tests/auto/language/testdata/erroneous/dependency_cycle4.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     Depends { name: "module-a" }
 }
diff --git a/tests/auto/language/testdata/erroneous/duplicate_sources.qbs b/tests/auto/language/testdata/erroneous/duplicate_sources.qbs
index 0546ac2e7..c056dc953 100644
--- a/tests/auto/language/testdata/erroneous/duplicate_sources.qbs
+++ b/tests/auto/language/testdata/erroneous/duplicate_sources.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     files: ["main.cpp"]
     Group {
diff --git a/tests/auto/language/testdata/erroneous/duplicate_sources_wildcards.qbs b/tests/auto/language/testdata/erroneous/duplicate_sources_wildcards.qbs
index a51aa26d1..6443590b9 100644
--- a/tests/auto/language/testdata/erroneous/duplicate_sources_wildcards.qbs
+++ b/tests/auto/language/testdata/erroneous/duplicate_sources_wildcards.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     files: ["*.qbs"]
     Group {
diff --git a/tests/auto/language/testdata/erroneous/importloop1.qbs b/tests/auto/language/testdata/erroneous/importloop1.qbs
index 91e8f620f..07a2487c4 100644
--- a/tests/auto/language/testdata/erroneous/importloop1.qbs
+++ b/tests/auto/language/testdata/erroneous/importloop1.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import "importloop2.qbs" as X
 
 X {}
diff --git a/tests/auto/language/testdata/erroneous/importloop2.qbs b/tests/auto/language/testdata/erroneous/importloop2.qbs
index c41fe7e9f..a49a331c9 100644
--- a/tests/auto/language/testdata/erroneous/importloop2.qbs
+++ b/tests/auto/language/testdata/erroneous/importloop2.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import "importloop1.qbs" as X
 
 X {}
diff --git a/tests/auto/language/testdata/erroneous/invalid-parameter-rhs.qbs b/tests/auto/language/testdata/erroneous/invalid-parameter-rhs.qbs
index 75dc83b3e..6389a9995 100644
--- a/tests/auto/language/testdata/erroneous/invalid-parameter-rhs.qbs
+++ b/tests/auto/language/testdata/erroneous/invalid-parameter-rhs.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     Depends { name: "prefix2.suffix" }
     Depends { name: "readonly"; prefix2.suffix.nope: access.will.fail }
diff --git a/tests/auto/language/testdata/erroneous/invalid-parameter-type.qbs b/tests/auto/language/testdata/erroneous/invalid-parameter-type.qbs
index 6a18a596c..72d075937 100644
--- a/tests/auto/language/testdata/erroneous/invalid-parameter-type.qbs
+++ b/tests/auto/language/testdata/erroneous/invalid-parameter-type.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     Depends { name: "module_with_parameters" }
     Depends {
diff --git a/tests/auto/language/testdata/erroneous/invalid-property-option.qbs b/tests/auto/language/testdata/erroneous/invalid-property-option.qbs
index 6e74faf8a..9c8d592e8 100644
--- a/tests/auto/language/testdata/erroneous/invalid-property-option.qbs
+++ b/tests/auto/language/testdata/erroneous/invalid-property-option.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     Depends { name: "module-with-wrong-property-option" }
 }
diff --git a/tests/auto/language/testdata/erroneous/invalid-references.qbs b/tests/auto/language/testdata/erroneous/invalid-references.qbs
index b224a45ac..6ea32aed8 100644
--- a/tests/auto/language/testdata/erroneous/invalid-references.qbs
+++ b/tests/auto/language/testdata/erroneous/invalid-references.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     references: "nosuchproject.qbs"
 }
diff --git a/tests/auto/language/testdata/erroneous/invalid_child_item_type.qbs b/tests/auto/language/testdata/erroneous/invalid_child_item_type.qbs
index 2341d4b9c..45c426666 100644
--- a/tests/auto/language/testdata/erroneous/invalid_child_item_type.qbs
+++ b/tests/auto/language/testdata/erroneous/invalid_child_item_type.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Project {
     Depends { name: "foo" }
 }
diff --git a/tests/auto/language/testdata/erroneous/invalid_file.qbs b/tests/auto/language/testdata/erroneous/invalid_file.qbs
index 18f2b044d..c461b87ef 100644
--- a/tests/auto/language/testdata/erroneous/invalid_file.qbs
+++ b/tests/auto/language/testdata/erroneous/invalid_file.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Application {
     files: ["main.cpp", "other.h"]
 }
diff --git a/tests/auto/language/testdata/erroneous/invalid_property_type.qbs b/tests/auto/language/testdata/erroneous/invalid_property_type.qbs
index b9b392736..e8907efff 100644
--- a/tests/auto/language/testdata/erroneous/invalid_property_type.qbs
+++ b/tests/auto/language/testdata/erroneous/invalid_property_type.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     property nonsense esnesnon
 }
diff --git a/tests/auto/language/testdata/erroneous/mismatching-multiplex-dependency.qbs b/tests/auto/language/testdata/erroneous/mismatching-multiplex-dependency.qbs
index 4d9f7a380..f75db3960 100644
--- a/tests/auto/language/testdata/erroneous/mismatching-multiplex-dependency.qbs
+++ b/tests/auto/language/testdata/erroneous/mismatching-multiplex-dependency.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         name: "a"
diff --git a/tests/auto/language/testdata/erroneous/missing-colon.qbs b/tests/auto/language/testdata/erroneous/missing-colon.qbs
index f05a2e6a2..e62eb7cfd 100644
--- a/tests/auto/language/testdata/erroneous/missing-colon.qbs
+++ b/tests/auto/language/testdata/erroneous/missing-colon.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     cpp.dynamicLibraries { }
 }
diff --git a/tests/auto/language/testdata/erroneous/misused-inherited-property.qbs b/tests/auto/language/testdata/erroneous/misused-inherited-property.qbs
index 37ee04158..2a87b66b2 100644
--- a/tests/auto/language/testdata/erroneous/misused-inherited-property.qbs
+++ b/tests/auto/language/testdata/erroneous/misused-inherited-property.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 ParentItem {
     cpp.compilerName: "blubb"
 }
diff --git a/tests/auto/language/testdata/erroneous/module-depends-on-product.qbs b/tests/auto/language/testdata/erroneous/module-depends-on-product.qbs
index 24e480cd8..a7db9e036 100644
--- a/tests/auto/language/testdata/erroneous/module-depends-on-product.qbs
+++ b/tests/auto/language/testdata/erroneous/module-depends-on-product.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         name: "p1"
diff --git a/tests/auto/language/testdata/erroneous/modules/module-a/module-a.qbs b/tests/auto/language/testdata/erroneous/modules/module-a/module-a.qbs
index e0f24191c..e4ebde40c 100644
--- a/tests/auto/language/testdata/erroneous/modules/module-a/module-a.qbs
+++ b/tests/auto/language/testdata/erroneous/modules/module-a/module-a.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "module-b" }
 }
diff --git a/tests/auto/language/testdata/erroneous/modules/module-b/module-b.qbs b/tests/auto/language/testdata/erroneous/modules/module-b/module-b.qbs
index fe3eb2b1e..482cdb131 100644
--- a/tests/auto/language/testdata/erroneous/modules/module-b/module-b.qbs
+++ b/tests/auto/language/testdata/erroneous/modules/module-b/module-b.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "module-a" }
 }
diff --git a/tests/auto/language/testdata/erroneous/modules/module-with-product-dependency/module-with-product-dependency.qbs b/tests/auto/language/testdata/erroneous/modules/module-with-product-dependency/module-with-product-dependency.qbs
index c5fa5c06e..5781bd6de 100644
--- a/tests/auto/language/testdata/erroneous/modules/module-with-product-dependency/module-with-product-dependency.qbs
+++ b/tests/auto/language/testdata/erroneous/modules/module-with-product-dependency/module-with-product-dependency.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "p2" }
 }
diff --git a/tests/auto/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..fb5c86553 100644
--- a/tests/auto/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
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     property string someProp
     PropertyOptions {
diff --git a/tests/auto/language/testdata/erroneous/modules/no_such_property/no-such-property.qbs b/tests/auto/language/testdata/erroneous/modules/no_such_property/no-such-property.qbs
index c836eafdf..a9d64f176 100644
--- a/tests/auto/language/testdata/erroneous/modules/no_such_property/no-such-property.qbs
+++ b/tests/auto/language/testdata/erroneous/modules/no_such_property/no-such-property.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "module_with_parameters" }
     module_with_parameters.noSuchProperty: true
diff --git a/tests/auto/language/testdata/erroneous/modules/prefix1/prefix1.qbs b/tests/auto/language/testdata/erroneous/modules/prefix1/prefix1.qbs
index 3e67ba10d..84957060c 100644
--- a/tests/auto/language/testdata/erroneous/modules/prefix1/prefix1.qbs
+++ b/tests/auto/language/testdata/erroneous/modules/prefix1/prefix1.qbs
@@ -1,4 +1,2 @@
-import qbs
-
 Module {
 }
diff --git a/tests/auto/language/testdata/erroneous/modules/prefix1/suffix/suffix.qbs b/tests/auto/language/testdata/erroneous/modules/prefix1/suffix/suffix.qbs
index 394794769..218a4feb7 100644
--- a/tests/auto/language/testdata/erroneous/modules/prefix1/suffix/suffix.qbs
+++ b/tests/auto/language/testdata/erroneous/modules/prefix1/suffix/suffix.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "prefix1" }
 }
diff --git a/tests/auto/language/testdata/erroneous/modules/prefix2/prefix2.qbs b/tests/auto/language/testdata/erroneous/modules/prefix2/prefix2.qbs
index bda21b8d5..a5aaa6f8b 100644
--- a/tests/auto/language/testdata/erroneous/modules/prefix2/prefix2.qbs
+++ b/tests/auto/language/testdata/erroneous/modules/prefix2/prefix2.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "prefix2.suffix" }
 }
diff --git a/tests/auto/language/testdata/erroneous/modules/prefix2/suffix/suffix.qbs b/tests/auto/language/testdata/erroneous/modules/prefix2/suffix/suffix.qbs
index 3e67ba10d..84957060c 100644
--- a/tests/auto/language/testdata/erroneous/modules/prefix2/suffix/suffix.qbs
+++ b/tests/auto/language/testdata/erroneous/modules/prefix2/suffix/suffix.qbs
@@ -1,4 +1,2 @@
-import qbs
-
 Module {
 }
diff --git a/tests/auto/language/testdata/erroneous/modules/readonly/readonly.qbs b/tests/auto/language/testdata/erroneous/modules/readonly/readonly.qbs
index 07ff9b5c5..da3990dbb 100644
--- a/tests/auto/language/testdata/erroneous/modules/readonly/readonly.qbs
+++ b/tests/auto/language/testdata/erroneous/modules/readonly/readonly.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     readonly property string readOnlyString: "I cannot be changed!"
 }
diff --git a/tests/auto/language/testdata/erroneous/multiple_properties_in_subproject.qbs b/tests/auto/language/testdata/erroneous/multiple_properties_in_subproject.qbs
index 0ecb41b34..04c5fe77f 100644
--- a/tests/auto/language/testdata/erroneous/multiple_properties_in_subproject.qbs
+++ b/tests/auto/language/testdata/erroneous/multiple_properties_in_subproject.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     SubProject {
         Properties { condition: false }
diff --git a/tests/auto/language/testdata/erroneous/no-configure-in-probe.qbs b/tests/auto/language/testdata/erroneous/no-configure-in-probe.qbs
index a4aa3d957..42a36c21f 100644
--- a/tests/auto/language/testdata/erroneous/no-configure-in-probe.qbs
+++ b/tests/auto/language/testdata/erroneous/no-configure-in-probe.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     Probe {
         id: hurz
diff --git a/tests/auto/language/testdata/erroneous/nonexistentouter.qbs b/tests/auto/language/testdata/erroneous/nonexistentouter.qbs
index 6c5899b5d..fb7de461a 100644
--- a/tests/auto/language/testdata/erroneous/nonexistentouter.qbs
+++ b/tests/auto/language/testdata/erroneous/nonexistentouter.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Project {
     Product {
         name: outer
diff --git a/tests/auto/language/testdata/erroneous/oldQbsVersion.qbs b/tests/auto/language/testdata/erroneous/oldQbsVersion.qbs
index fb0915d83..90658e976 100644
--- a/tests/auto/language/testdata/erroneous/oldQbsVersion.qbs
+++ b/tests/auto/language/testdata/erroneous/oldQbsVersion.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     minimumQbsVersion: "999.5.4"
     Product {
diff --git a/tests/auto/language/testdata/erroneous/original-in-product-property.qbs b/tests/auto/language/testdata/erroneous/original-in-product-property.qbs
index 867f3e0e7..cbc1cbe14 100644
--- a/tests/auto/language/testdata/erroneous/original-in-product-property.qbs
+++ b/tests/auto/language/testdata/erroneous/original-in-product-property.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     property int n: original
 }
diff --git a/tests/auto/language/testdata/erroneous/overwrite-inherited-readonly-property.qbs b/tests/auto/language/testdata/erroneous/overwrite-inherited-readonly-property.qbs
index 629f39ae4..35b238a41 100644
--- a/tests/auto/language/testdata/erroneous/overwrite-inherited-readonly-property.qbs
+++ b/tests/auto/language/testdata/erroneous/overwrite-inherited-readonly-property.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 ParentItem {
     readOnlyString: "changing the unchangeable"
 }
diff --git a/tests/auto/language/testdata/erroneous/overwrite-readonly-module-property.qbs b/tests/auto/language/testdata/erroneous/overwrite-readonly-module-property.qbs
index 3e2f6927d..6b400a5e0 100644
--- a/tests/auto/language/testdata/erroneous/overwrite-readonly-module-property.qbs
+++ b/tests/auto/language/testdata/erroneous/overwrite-readonly-module-property.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     Depends { name: "readonly" }
     readonly.readOnlyString: "changing the unchangeable"
diff --git a/tests/auto/language/testdata/erroneous/properties-item-with-invalid-condition.qbs b/tests/auto/language/testdata/erroneous/properties-item-with-invalid-condition.qbs
index 00e3267c2..5b1a41f1b 100644
--- a/tests/auto/language/testdata/erroneous/properties-item-with-invalid-condition.qbs
+++ b/tests/auto/language/testdata/erroneous/properties-item-with-invalid-condition.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     Depends  { name: "cpp" }
     Properties {
diff --git a/tests/auto/language/testdata/erroneous/references_cycle.qbs b/tests/auto/language/testdata/erroneous/references_cycle.qbs
index 6d0960f09..2dba23003 100644
--- a/tests/auto/language/testdata/erroneous/references_cycle.qbs
+++ b/tests/auto/language/testdata/erroneous/references_cycle.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Project {
     references: ["references_cycle2.qbs"]
 }
diff --git a/tests/auto/language/testdata/erroneous/references_cycle2.qbs b/tests/auto/language/testdata/erroneous/references_cycle2.qbs
index 0b0d2734d..20a48a106 100644
--- a/tests/auto/language/testdata/erroneous/references_cycle2.qbs
+++ b/tests/auto/language/testdata/erroneous/references_cycle2.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Project {
     references: ["references_cycle3.qbs"]
 }
diff --git a/tests/auto/language/testdata/erroneous/references_cycle3.qbs b/tests/auto/language/testdata/erroneous/references_cycle3.qbs
index 2a237d154..9af06d473 100644
--- a/tests/auto/language/testdata/erroneous/references_cycle3.qbs
+++ b/tests/auto/language/testdata/erroneous/references_cycle3.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Project {
     references: ["references_cycle.qbs"]
 }
diff --git a/tests/auto/language/testdata/erroneous/reserved_name_in_import.qbs b/tests/auto/language/testdata/erroneous/reserved_name_in_import.qbs
index 3940109d0..d688556a5 100644
--- a/tests/auto/language/testdata/erroneous/reserved_name_in_import.qbs
+++ b/tests/auto/language/testdata/erroneous/reserved_name_in_import.qbs
@@ -1,4 +1,3 @@
-import qbs
 import "../idusagebase.qbs" as TextFile
 
 Product { }
diff --git a/tests/auto/language/testdata/erroneous/rule-without-output-tags.qbs b/tests/auto/language/testdata/erroneous/rule-without-output-tags.qbs
index 316448858..a05800e81 100644
--- a/tests/auto/language/testdata/erroneous/rule-without-output-tags.qbs
+++ b/tests/auto/language/testdata/erroneous/rule-without-output-tags.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     Rule {
         inputs: "input-tag"
diff --git a/tests/auto/language/testdata/erroneous/same-module-prefix1.qbs b/tests/auto/language/testdata/erroneous/same-module-prefix1.qbs
index a5275eb15..8aba31c2a 100644
--- a/tests/auto/language/testdata/erroneous/same-module-prefix1.qbs
+++ b/tests/auto/language/testdata/erroneous/same-module-prefix1.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     Depends { name: "prefix1.suffix" }
 }
diff --git a/tests/auto/language/testdata/erroneous/same-module-prefix2.qbs b/tests/auto/language/testdata/erroneous/same-module-prefix2.qbs
index 3c4ec02a4..6679091c2 100644
--- a/tests/auto/language/testdata/erroneous/same-module-prefix2.qbs
+++ b/tests/auto/language/testdata/erroneous/same-module-prefix2.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     Depends { name: "prefix2" }
 }
diff --git a/tests/auto/language/testdata/erroneous/subproject_cycle.qbs b/tests/auto/language/testdata/erroneous/subproject_cycle.qbs
index 0a9cd289f..ff1904ab5 100644
--- a/tests/auto/language/testdata/erroneous/subproject_cycle.qbs
+++ b/tests/auto/language/testdata/erroneous/subproject_cycle.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Project {
     SubProject {
         filePath: "subproject_cycle2.qbs"
diff --git a/tests/auto/language/testdata/erroneous/subproject_cycle2.qbs b/tests/auto/language/testdata/erroneous/subproject_cycle2.qbs
index ab92d76dd..2fe735714 100644
--- a/tests/auto/language/testdata/erroneous/subproject_cycle2.qbs
+++ b/tests/auto/language/testdata/erroneous/subproject_cycle2.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Project {
     SubProject {
         filePath: "subproject_cycle3.qbs"
diff --git a/tests/auto/language/testdata/erroneous/subproject_cycle3.qbs b/tests/auto/language/testdata/erroneous/subproject_cycle3.qbs
index af1e50f5a..288922127 100644
--- a/tests/auto/language/testdata/erroneous/subproject_cycle3.qbs
+++ b/tests/auto/language/testdata/erroneous/subproject_cycle3.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Project {
     SubProject {
         filePath: "subproject_cycle.qbs"
diff --git a/tests/auto/language/testdata/erroneous/syntax-error-in-probe.qbs b/tests/auto/language/testdata/erroneous/syntax-error-in-probe.qbs
index e81274395..a1f1c74ae 100644
--- a/tests/auto/language/testdata/erroneous/syntax-error-in-probe.qbs
+++ b/tests/auto/language/testdata/erroneous/syntax-error-in-probe.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     Probe {
         id: hurz
diff --git a/tests/auto/language/testdata/erroneous/throw_in_property_binding.qbs b/tests/auto/language/testdata/erroneous/throw_in_property_binding.qbs
index fc251b1a4..88deb2299 100644
--- a/tests/auto/language/testdata/erroneous/throw_in_property_binding.qbs
+++ b/tests/auto/language/testdata/erroneous/throw_in_property_binding.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Product {
     name: {
         throw "something is wrong";
diff --git a/tests/auto/language/testdata/erroneous/undeclared-parameter1.qbs b/tests/auto/language/testdata/erroneous/undeclared-parameter1.qbs
index 14f141678..fb858ef80 100644
--- a/tests/auto/language/testdata/erroneous/undeclared-parameter1.qbs
+++ b/tests/auto/language/testdata/erroneous/undeclared-parameter1.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     Depends { name: "prefix2.suffix" }
     Depends { name: "readonly"; prefix2.suffix.nope: "nope" }
diff --git a/tests/auto/language/testdata/erroneous/undeclared-parameter2.qbs b/tests/auto/language/testdata/erroneous/undeclared-parameter2.qbs
index 074acc1a3..6fe2ce51b 100644
--- a/tests/auto/language/testdata/erroneous/undeclared-parameter2.qbs
+++ b/tests/auto/language/testdata/erroneous/undeclared-parameter2.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     name: "myproduct"
     Depends { name: "readonly"; foo.bar: "bla" }
diff --git a/tests/auto/language/testdata/erroneous/undeclared_item.qbs b/tests/auto/language/testdata/erroneous/undeclared_item.qbs
index b2edbf013..ab25735b7 100644
--- a/tests/auto/language/testdata/erroneous/undeclared_item.qbs
+++ b/tests/auto/language/testdata/erroneous/undeclared_item.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Product {
     cpp.defines: ["SUPERCRAZY"]
 }
diff --git a/tests/auto/language/testdata/erroneous/undeclared_module_property_in_module.qbs b/tests/auto/language/testdata/erroneous/undeclared_module_property_in_module.qbs
index 092bf143d..421302f22 100644
--- a/tests/auto/language/testdata/erroneous/undeclared_module_property_in_module.qbs
+++ b/tests/auto/language/testdata/erroneous/undeclared_module_property_in_module.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     name: "p"
     Depends { name: "no_such_property" }
diff --git a/tests/auto/language/testdata/erroneous/undeclared_property.qbs b/tests/auto/language/testdata/erroneous/undeclared_property.qbs
index 1dad5f747..a16ab3b93 100644
--- a/tests/auto/language/testdata/erroneous/undeclared_property.qbs
+++ b/tests/auto/language/testdata/erroneous/undeclared_property.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Product {
     doesntexist: 123
 }
diff --git a/tests/auto/language/testdata/erroneous/undeclared_property_in_Properties_item.qbs b/tests/auto/language/testdata/erroneous/undeclared_property_in_Properties_item.qbs
index d9bd00ce7..814513b10 100644
--- a/tests/auto/language/testdata/erroneous/undeclared_property_in_Properties_item.qbs
+++ b/tests/auto/language/testdata/erroneous/undeclared_property_in_Properties_item.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     Properties {
         condition: true
diff --git a/tests/auto/language/testdata/erroneous/undeclared_property_in_export_item.qbs b/tests/auto/language/testdata/erroneous/undeclared_property_in_export_item.qbs
index e5fc74b74..badfc7bf3 100644
--- a/tests/auto/language/testdata/erroneous/undeclared_property_in_export_item.qbs
+++ b/tests/auto/language/testdata/erroneous/undeclared_property_in_export_item.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         name: "p1"
diff --git a/tests/auto/language/testdata/erroneous/undeclared_property_in_export_item2.qbs b/tests/auto/language/testdata/erroneous/undeclared_property_in_export_item2.qbs
index 1cb4c42ee..82258ec0f 100644
--- a/tests/auto/language/testdata/erroneous/undeclared_property_in_export_item2.qbs
+++ b/tests/auto/language/testdata/erroneous/undeclared_property_in_export_item2.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         name: "p1"
diff --git a/tests/auto/language/testdata/erroneous/undeclared_property_in_export_item3.qbs b/tests/auto/language/testdata/erroneous/undeclared_property_in_export_item3.qbs
index cd23aefe4..ddeaf01db 100644
--- a/tests/auto/language/testdata/erroneous/undeclared_property_in_export_item3.qbs
+++ b/tests/auto/language/testdata/erroneous/undeclared_property_in_export_item3.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         name: "p1"
diff --git a/tests/auto/language/testdata/erroneous/undeclared_property_wrapper.qbs b/tests/auto/language/testdata/erroneous/undeclared_property_wrapper.qbs
index a5d9b19b3..9ab750765 100644
--- a/tests/auto/language/testdata/erroneous/undeclared_property_wrapper.qbs
+++ b/tests/auto/language/testdata/erroneous/undeclared_property_wrapper.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     SubProject {
         filePath: "undeclared_property.qbs"
diff --git a/tests/auto/language/testdata/erroneous/wrong-toplevel-item.qbs b/tests/auto/language/testdata/erroneous/wrong-toplevel-item.qbs
index 57e60ba4a..b441c2eaf 100644
--- a/tests/auto/language/testdata/erroneous/wrong-toplevel-item.qbs
+++ b/tests/auto/language/testdata/erroneous/wrong-toplevel-item.qbs
@@ -1,4 +1,2 @@
-import qbs
-
 Artifact {
 }
diff --git a/tests/auto/language/testdata/erroneous/wrongQbsVersionFormat.qbs b/tests/auto/language/testdata/erroneous/wrongQbsVersionFormat.qbs
index 36c9fea7c..41b195e75 100644
--- a/tests/auto/language/testdata/erroneous/wrongQbsVersionFormat.qbs
+++ b/tests/auto/language/testdata/erroneous/wrongQbsVersionFormat.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     minimumQbsVersion: "hfyh1234wat?"
 }
diff --git a/tests/auto/language/testdata/error-in-disabled-product.qbs b/tests/auto/language/testdata/error-in-disabled-product.qbs
index 9f9b458a5..1d13412e1 100644
--- a/tests/auto/language/testdata/error-in-disabled-product.qbs
+++ b/tests/auto/language/testdata/error-in-disabled-product.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         name: "a"
diff --git a/tests/auto/language/testdata/exports.qbs b/tests/auto/language/testdata/exports.qbs
index 3f4e3cf49..cc86b1e4a 100644
--- a/tests/auto/language/testdata/exports.qbs
+++ b/tests/auto/language/testdata/exports.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import "exports_product.qbs" as ProductWithInheritedExportItem
 
 Project {
diff --git a/tests/auto/language/testdata/filetags.qbs b/tests/auto/language/testdata/filetags.qbs
index b2a85f953..d055b7b1a 100644
--- a/tests/auto/language/testdata/filetags.qbs
+++ b/tests/auto/language/testdata/filetags.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Project {
     FileTagger {
         patterns: "*.cpp"
diff --git a/tests/auto/language/testdata/groupconditions.qbs b/tests/auto/language/testdata/groupconditions.qbs
index 244c80c2c..b7f383d45 100644
--- a/tests/auto/language/testdata/groupconditions.qbs
+++ b/tests/auto/language/testdata/groupconditions.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Project {
     property bool someTrueProperty: true
     Product {
diff --git a/tests/auto/language/testdata/homeDirectory.qbs b/tests/auto/language/testdata/homeDirectory.qbs
index 1ceeb5bbd..f04c173b9 100644
--- a/tests/auto/language/testdata/homeDirectory.qbs
+++ b/tests/auto/language/testdata/homeDirectory.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Project {
     Product {
         name: "home"
diff --git a/tests/auto/language/testdata/id-uniqueness.qbs b/tests/auto/language/testdata/id-uniqueness.qbs
index cfbaf8548..9f1bb7016 100644
--- a/tests/auto/language/testdata/id-uniqueness.qbs
+++ b/tests/auto/language/testdata/id-uniqueness.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import "idusagebase.qbs" as DerivedProduct
 
 Project {
diff --git a/tests/auto/language/testdata/idusage.qbs b/tests/auto/language/testdata/idusage.qbs
index c55b47234..9a070cea6 100644
--- a/tests/auto/language/testdata/idusage.qbs
+++ b/tests/auto/language/testdata/idusage.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import "idusagebase.qbs" as DerivedProduct
 
 Project {
diff --git a/tests/auto/language/testdata/import-collection/project.qbs b/tests/auto/language/testdata/import-collection/project.qbs
index ee34869b4..056cb3b4d 100644
--- a/tests/auto/language/testdata/import-collection/project.qbs
+++ b/tests/auto/language/testdata/import-collection/project.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     references: ["product.qbs"]
 }
diff --git a/tests/auto/language/testdata/invalid-overrides.qbs b/tests/auto/language/testdata/invalid-overrides.qbs
index 93e6c34c8..af113ec13 100644
--- a/tests/auto/language/testdata/invalid-overrides.qbs
+++ b/tests/auto/language/testdata/invalid-overrides.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     name: "My.Project"
     property bool x
diff --git a/tests/auto/language/testdata/invalidBindingInDisabledItem.qbs b/tests/auto/language/testdata/invalidBindingInDisabledItem.qbs
index e3e03a319..80895a515 100644
--- a/tests/auto/language/testdata/invalidBindingInDisabledItem.qbs
+++ b/tests/auto/language/testdata/invalidBindingInDisabledItem.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Project {
     Product {
         name: "product1"
diff --git a/tests/auto/language/testdata/module-merging-variant-values/module-merging-variant-values.qbs b/tests/auto/language/testdata/module-merging-variant-values/module-merging-variant-values.qbs
index e4bf0ad4f..c633dcc45 100644
--- a/tests/auto/language/testdata/module-merging-variant-values/module-merging-variant-values.qbs
+++ b/tests/auto/language/testdata/module-merging-variant-values/module-merging-variant-values.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     multiplexByQbsProperties: ["architectures"]
     qbs.architectures: ["a1", "a2"]
diff --git a/tests/auto/language/testdata/module-prioritization-by-search-path/product.qbs b/tests/auto/language/testdata/module-prioritization-by-search-path/product.qbs
index 28033b174..62a08f028 100644
--- a/tests/auto/language/testdata/module-prioritization-by-search-path/product.qbs
+++ b/tests/auto/language/testdata/module-prioritization-by-search-path/product.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     Depends { name: "conflicting-instances" }
 }
diff --git a/tests/auto/language/testdata/module-prioritization-by-search-path/project.qbs b/tests/auto/language/testdata/module-prioritization-by-search-path/project.qbs
index 113a5773c..af1fe0e53 100644
--- a/tests/auto/language/testdata/module-prioritization-by-search-path/project.qbs
+++ b/tests/auto/language/testdata/module-prioritization-by-search-path/project.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     references: ["product.qbs"]
 }
diff --git a/tests/auto/language/testdata/module-property-overrides-per-product.qbs b/tests/auto/language/testdata/module-property-overrides-per-product.qbs
index 3ff811080..88fee111a 100644
--- a/tests/auto/language/testdata/module-property-overrides-per-product.qbs
+++ b/tests/auto/language/testdata/module-property-overrides-per-product.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         Depends { name: "dummy" }
diff --git a/tests/auto/language/testdata/moduleproperties.qbs b/tests/auto/language/testdata/moduleproperties.qbs
index d1c7e4e7f..8c9d57f16 100644
--- a/tests/auto/language/testdata/moduleproperties.qbs
+++ b/tests/auto/language/testdata/moduleproperties.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Project {
     name: "MyProject"
     property string projectName: name
diff --git a/tests/auto/language/testdata/modulepropertiesingroups.qbs b/tests/auto/language/testdata/modulepropertiesingroups.qbs
index 5a1e75ab8..e3857bdf4 100644
--- a/tests/auto/language/testdata/modulepropertiesingroups.qbs
+++ b/tests/auto/language/testdata/modulepropertiesingroups.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Project {
     Product {
         name: "grouptest"
diff --git a/tests/auto/language/testdata/modules/dummy2/dummy2.qbs b/tests/auto/language/testdata/modules/dummy2/dummy2.qbs
index b4a223c19..9e47ee7d2 100644
--- a/tests/auto/language/testdata/modules/dummy2/dummy2.qbs
+++ b/tests/auto/language/testdata/modules/dummy2/dummy2.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Module {
     additionalProductTypes: ["tag3"]
 
diff --git a/tests/auto/language/testdata/modules/dummy3_loader/dummy3_loader.qbs b/tests/auto/language/testdata/modules/dummy3_loader/dummy3_loader.qbs
index 988f86f11..fc4a3d6b8 100644
--- a/tests/auto/language/testdata/modules/dummy3_loader/dummy3_loader.qbs
+++ b/tests/auto/language/testdata/modules/dummy3_loader/dummy3_loader.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Module {
     Depends { name: "dummy3" }
     dummy3.loadDummy: true
diff --git a/tests/auto/language/testdata/modules/dummyqt/core/dummycore.qbs b/tests/auto/language/testdata/modules/dummyqt/core/dummycore.qbs
index c6ec74003..746c7e37b 100644
--- a/tests/auto/language/testdata/modules/dummyqt/core/dummycore.qbs
+++ b/tests/auto/language/testdata/modules/dummyqt/core/dummycore.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Module {
     id: qtcore
     property int versionMajor: 5
diff --git a/tests/auto/language/testdata/modules/dummyqt/gui/dummygui.qbs b/tests/auto/language/testdata/modules/dummyqt/gui/dummygui.qbs
index 52dc82d23..b65d5ca14 100644
--- a/tests/auto/language/testdata/modules/dummyqt/gui/dummygui.qbs
+++ b/tests/auto/language/testdata/modules/dummyqt/gui/dummygui.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Module {
     Depends { name: "dummyqt.core" }
     property string guiProperty: "guiProperty"
diff --git a/tests/auto/language/testdata/modules/dummyqt/network/dummynetwork.qbs b/tests/auto/language/testdata/modules/dummyqt/network/dummynetwork.qbs
index 2da3af050..8a685b9a7 100644
--- a/tests/auto/language/testdata/modules/dummyqt/network/dummynetwork.qbs
+++ b/tests/auto/language/testdata/modules/dummyqt/network/dummynetwork.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Module {
     Depends { name: "dummyqt"; submodules: ["core"] }
     property string networkProperty: "networkProperty"
diff --git a/tests/auto/language/testdata/modules/gmod/gmod1/gmod1.qbs b/tests/auto/language/testdata/modules/gmod/gmod1/gmod1.qbs
index d3bb92fff..9a9c60871 100644
--- a/tests/auto/language/testdata/modules/gmod/gmod1/gmod1.qbs
+++ b/tests/auto/language/testdata/modules/gmod/gmod1/gmod1.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "gmod2" }
     Depends { name: "gmod4" }
diff --git a/tests/auto/language/testdata/modules/gmod2/gmod2.qbs b/tests/auto/language/testdata/modules/gmod2/gmod2.qbs
index e221f50b2..dbaad572e 100644
--- a/tests/auto/language/testdata/modules/gmod2/gmod2.qbs
+++ b/tests/auto/language/testdata/modules/gmod2/gmod2.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     property int prop: 0
     property string gmod2_string: "gmod2_string_proto"
diff --git a/tests/auto/language/testdata/modules/gmod3/qmod3.qbs b/tests/auto/language/testdata/modules/gmod3/qmod3.qbs
index 1c8704b5d..dfd9c8c7b 100644
--- a/tests/auto/language/testdata/modules/gmod3/qmod3.qbs
+++ b/tests/auto/language/testdata/modules/gmod3/qmod3.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "gmod2" }
     property string gmod3_string: "gmod3_string_proto"
diff --git a/tests/auto/language/testdata/modules/gmod4/gmod4.qbs b/tests/auto/language/testdata/modules/gmod4/gmod4.qbs
index c06f4e965..47c0b7517 100644
--- a/tests/auto/language/testdata/modules/gmod4/gmod4.qbs
+++ b/tests/auto/language/testdata/modules/gmod4/gmod4.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "gmod2" }
     Depends { name: "gmod3" }
diff --git a/tests/auto/language/testdata/modules/multiple_backends/backend1.qbs b/tests/auto/language/testdata/modules/multiple_backends/backend1.qbs
index 011f96af8..794c67827 100644
--- a/tests/auto/language/testdata/modules/multiple_backends/backend1.qbs
+++ b/tests/auto/language/testdata/modules/multiple_backends/backend1.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     condition: qbs.targetOS.contains("os1")
     property string prop: "backend 1"
diff --git a/tests/auto/language/testdata/modules/multiple_backends/backend2.qbs b/tests/auto/language/testdata/modules/multiple_backends/backend2.qbs
index 93532005e..2073c4d0b 100644
--- a/tests/auto/language/testdata/modules/multiple_backends/backend2.qbs
+++ b/tests/auto/language/testdata/modules/multiple_backends/backend2.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     condition: qbs.targetOS.contains("os2")
     property string prop: "backend 2"
diff --git a/tests/auto/language/testdata/modules/multiple_backends/backend3.qbs b/tests/auto/language/testdata/modules/multiple_backends/backend3.qbs
index fda80b4ad..16228108b 100644
--- a/tests/auto/language/testdata/modules/multiple_backends/backend3.qbs
+++ b/tests/auto/language/testdata/modules/multiple_backends/backend3.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     condition: qbs.targetOS.contains("os2") && qbs.toolchain.contains("tc")
     priority: 1
diff --git a/tests/auto/language/testdata/modules/scopemod/scopemod.qbs b/tests/auto/language/testdata/modules/scopemod/scopemod.qbs
index ba7dbcbf0..a2c611dde 100644
--- a/tests/auto/language/testdata/modules/scopemod/scopemod.qbs
+++ b/tests/auto/language/testdata/modules/scopemod/scopemod.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Module {
     property int a: 1
     property int b: 1
diff --git a/tests/auto/language/testdata/modulescope.qbs b/tests/auto/language/testdata/modulescope.qbs
index c127f0c61..c3c9db5d9 100644
--- a/tests/auto/language/testdata/modulescope.qbs
+++ b/tests/auto/language/testdata/modulescope.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import "modulescope_base.qbs" as MyProduct
 
 Project {
diff --git a/tests/auto/language/testdata/modulescope_base.qbs b/tests/auto/language/testdata/modulescope_base.qbs
index 16a9875fa..85db4ec16 100644
--- a/tests/auto/language/testdata/modulescope_base.qbs
+++ b/tests/auto/language/testdata/modulescope_base.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Product {
     Depends { name: "scopemod" }
     scopemod.h: e * f
diff --git a/tests/auto/language/testdata/multiplexed-exports.qbs b/tests/auto/language/testdata/multiplexed-exports.qbs
index 923ddc2ab..f98ceff95 100644
--- a/tests/auto/language/testdata/multiplexed-exports.qbs
+++ b/tests/auto/language/testdata/multiplexed-exports.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         name: "dep"
diff --git a/tests/auto/language/testdata/multiplexing-by-profile/p1.qbs b/tests/auto/language/testdata/multiplexing-by-profile/p1.qbs
index 207b5df61..b7abd942a 100644
--- a/tests/auto/language/testdata/multiplexing-by-profile/p1.qbs
+++ b/tests/auto/language/testdata/multiplexing-by-profile/p1.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Profile {
         name: "theProfile"
diff --git a/tests/auto/language/testdata/multiplexing-by-profile/p2.qbs b/tests/auto/language/testdata/multiplexing-by-profile/p2.qbs
index 13db0afd7..94a0e4769 100644
--- a/tests/auto/language/testdata/multiplexing-by-profile/p2.qbs
+++ b/tests/auto/language/testdata/multiplexing-by-profile/p2.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Profile {
         name: "profile1"
diff --git a/tests/auto/language/testdata/multiplexing-by-profile/p3.qbs b/tests/auto/language/testdata/multiplexing-by-profile/p3.qbs
index 4c01e7c46..49f998826 100644
--- a/tests/auto/language/testdata/multiplexing-by-profile/p3.qbs
+++ b/tests/auto/language/testdata/multiplexing-by-profile/p3.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Profile {
         name: "profile1"
diff --git a/tests/auto/language/testdata/multiplexing-by-profile/p4.qbs b/tests/auto/language/testdata/multiplexing-by-profile/p4.qbs
index 84695e85d..c71b78b98 100644
--- a/tests/auto/language/testdata/multiplexing-by-profile/p4.qbs
+++ b/tests/auto/language/testdata/multiplexing-by-profile/p4.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Profile {
         name: "profile1"
diff --git a/tests/auto/language/testdata/non-required-products.qbs b/tests/auto/language/testdata/non-required-products.qbs
index fb21e609e..6fc2cfe16 100644
--- a/tests/auto/language/testdata/non-required-products.qbs
+++ b/tests/auto/language/testdata/non-required-products.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         name: "depender"
diff --git a/tests/auto/language/testdata/outerInGroup.qbs b/tests/auto/language/testdata/outerInGroup.qbs
index 751392a4d..21136225a 100644
--- a/tests/auto/language/testdata/outerInGroup.qbs
+++ b/tests/auto/language/testdata/outerInGroup.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Project {
     Product {
         name: "OuterInGroup"
diff --git a/tests/auto/language/testdata/overridden-properties-and-prototypes.qbs b/tests/auto/language/testdata/overridden-properties-and-prototypes.qbs
index b0b37d804..0f6a1f812 100644
--- a/tests/auto/language/testdata/overridden-properties-and-prototypes.qbs
+++ b/tests/auto/language/testdata/overridden-properties-and-prototypes.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     name: "p"
     Depends { name: "multiple_backends" }
diff --git a/tests/auto/language/testdata/parameter-types.qbs b/tests/auto/language/testdata/parameter-types.qbs
index 6406d56c9..16415179f 100644
--- a/tests/auto/language/testdata/parameter-types.qbs
+++ b/tests/auto/language/testdata/parameter-types.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         name: "foo"
diff --git a/tests/auto/language/testdata/productconditions.qbs b/tests/auto/language/testdata/productconditions.qbs
index e815cc88e..bc3671134 100644
--- a/tests/auto/language/testdata/productconditions.qbs
+++ b/tests/auto/language/testdata/productconditions.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import qbs.Probes
 
 Project {
diff --git a/tests/auto/language/testdata/productdirectories.qbs b/tests/auto/language/testdata/productdirectories.qbs
index dc4315207..ec24352a2 100644
--- a/tests/auto/language/testdata/productdirectories.qbs
+++ b/tests/auto/language/testdata/productdirectories.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Product {
     name: "MyApp"
 }
diff --git a/tests/auto/language/testdata/profilevaluesandoverriddenvalues.qbs b/tests/auto/language/testdata/profilevaluesandoverriddenvalues.qbs
index 1cb88e18f..3aaa0cfa9 100644
--- a/tests/auto/language/testdata/profilevaluesandoverriddenvalues.qbs
+++ b/tests/auto/language/testdata/profilevaluesandoverriddenvalues.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Project {
     Application {
         name: "product1"
diff --git a/tests/auto/language/testdata/properties-block-in-group.qbs b/tests/auto/language/testdata/properties-block-in-group.qbs
index c2bfea0a8..b77de7c6b 100644
--- a/tests/auto/language/testdata/properties-block-in-group.qbs
+++ b/tests/auto/language/testdata/properties-block-in-group.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     name: "in-group"
     property bool featureEnabled: true
diff --git a/tests/auto/language/testdata/properties-item-in-module.qbs b/tests/auto/language/testdata/properties-item-in-module.qbs
index 53c765d49..60f3afea0 100644
--- a/tests/auto/language/testdata/properties-item-in-module.qbs
+++ b/tests/auto/language/testdata/properties-item-in-module.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product { name: "a"; Depends { name: "dummyqt.core" } }
     Product { name: "b"; Depends { name: "dummyqt.core" } }
diff --git a/tests/auto/language/testdata/propertiesblocks.qbs b/tests/auto/language/testdata/propertiesblocks.qbs
index d6a8dee23..34776cfac 100644
--- a/tests/auto/language/testdata/propertiesblocks.qbs
+++ b/tests/auto/language/testdata/propertiesblocks.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import "propertiesblocks_base.qbs" as ProductBase
 
 Project {
diff --git a/tests/auto/language/testdata/propertiesblocks_base.qbs b/tests/auto/language/testdata/propertiesblocks_base.qbs
index d68c5127f..be6e57d65 100644
--- a/tests/auto/language/testdata/propertiesblocks_base.qbs
+++ b/tests/auto/language/testdata/propertiesblocks_base.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Product {
     property bool defineBase: true
     Depends { name: "dummy" }
diff --git a/tests/auto/language/testdata/property-assignment-in-exported-group.qbs b/tests/auto/language/testdata/property-assignment-in-exported-group.qbs
index d82f50ee6..7d48cf06d 100644
--- a/tests/auto/language/testdata/property-assignment-in-exported-group.qbs
+++ b/tests/auto/language/testdata/property-assignment-in-exported-group.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         name: "dep"
diff --git a/tests/auto/language/testdata/qbs-properties-in-project-condition.qbs b/tests/auto/language/testdata/qbs-properties-in-project-condition.qbs
index d3aa2d2ad..31f648233 100644
--- a/tests/auto/language/testdata/qbs-properties-in-project-condition.qbs
+++ b/tests/auto/language/testdata/qbs-properties-in-project-condition.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     condition: qbs.targetOS.contains("whatever")
 
diff --git a/tests/auto/language/testdata/qbs-property-convenience-override.qbs b/tests/auto/language/testdata/qbs-property-convenience-override.qbs
index d4a8e7279..85f2d2327 100644
--- a/tests/auto/language/testdata/qbs-property-convenience-override.qbs
+++ b/tests/auto/language/testdata/qbs-property-convenience-override.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     name: "p"
     qbs.installPrefix: "/usr/local"
diff --git a/tests/auto/language/testdata/qbs1275.qbs b/tests/auto/language/testdata/qbs1275.qbs
index 898e1f165..f88d62a71 100644
--- a/tests/auto/language/testdata/qbs1275.qbs
+++ b/tests/auto/language/testdata/qbs1275.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         name: "v-bug"
diff --git a/tests/auto/language/testdata/recursive-dependencies/recursive-dependencies.qbs b/tests/auto/language/testdata/recursive-dependencies/recursive-dependencies.qbs
index 34d7089d3..e63ae5f5b 100644
--- a/tests/auto/language/testdata/recursive-dependencies/recursive-dependencies.qbs
+++ b/tests/auto/language/testdata/recursive-dependencies/recursive-dependencies.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         name: "p1"
diff --git a/tests/auto/language/testdata/relaxed-error-mode/relaxed-error-mode.qbs b/tests/auto/language/testdata/relaxed-error-mode/relaxed-error-mode.qbs
index fa6190ca4..561cda098 100644
--- a/tests/auto/language/testdata/relaxed-error-mode/relaxed-error-mode.qbs
+++ b/tests/auto/language/testdata/relaxed-error-mode/relaxed-error-mode.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         name: "recursive depender"
diff --git a/tests/auto/language/testdata/required-and-nonrequired-dependencies/complicated.qbs b/tests/auto/language/testdata/required-and-nonrequired-dependencies/complicated.qbs
index 2173948f9..2286c4c66 100644
--- a/tests/auto/language/testdata/required-and-nonrequired-dependencies/complicated.qbs
+++ b/tests/auto/language/testdata/required-and-nonrequired-dependencies/complicated.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     Depends { name: "failing-validation"; required: false }
     Depends { name: "failing-validation-indirect" }
diff --git a/tests/auto/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..2998308d1 100644
--- a/tests/auto/language/testdata/required-and-nonrequired-dependencies/dependency-via-export.qbs
+++ b/tests/auto/language/testdata/required-and-nonrequired-dependencies/dependency-via-export.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         name: "dep"
diff --git a/tests/auto/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..f279cbd87 100644
--- a/tests/auto/language/testdata/required-and-nonrequired-dependencies/dependency-via-module.qbs
+++ b/tests/auto/language/testdata/required-and-nonrequired-dependencies/dependency-via-module.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     Depends { name: "failing-validation"; required: false }
     Depends { name: "failing-validation-indirect" }
diff --git a/tests/auto/language/testdata/required-and-nonrequired-dependencies/direct-dependencies.qbs b/tests/auto/language/testdata/required-and-nonrequired-dependencies/direct-dependencies.qbs
index cf2f0f245..671a19666 100644
--- a/tests/auto/language/testdata/required-and-nonrequired-dependencies/direct-dependencies.qbs
+++ b/tests/auto/language/testdata/required-and-nonrequired-dependencies/direct-dependencies.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     Depends { name: "failing-validation"; required: false }
     Depends { name: "failing-validation" }
diff --git a/tests/auto/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..b715ae68c 100644
--- a/tests/auto/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
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "failing-validation" }
 }
diff --git a/tests/auto/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..f7fdc415f 100644
--- a/tests/auto/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
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     validate: { throw "validation error!"; }
 }
diff --git a/tests/auto/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..3b3d86e9d 100644
--- a/tests/auto/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
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         name: "dep2"
diff --git a/tests/auto/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..19921c823 100644
--- a/tests/auto/language/testdata/required-and-nonrequired-dependencies/required-chain-export.qbs
+++ b/tests/auto/language/testdata/required-and-nonrequired-dependencies/required-chain-export.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         name: "dep"
diff --git a/tests/auto/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..262d5b6b6 100644
--- a/tests/auto/language/testdata/required-and-nonrequired-dependencies/required-chain-module.qbs
+++ b/tests/auto/language/testdata/required-and-nonrequired-dependencies/required-chain-module.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     Depends { name: "failing-validation"; required: false }
     Depends { name: "failing-validation-indirect"; required: false }
diff --git a/tests/auto/language/testdata/rfc1034identifier.qbs b/tests/auto/language/testdata/rfc1034identifier.qbs
index eb73dc4d6..885053718 100644
--- a/tests/auto/language/testdata/rfc1034identifier.qbs
+++ b/tests/auto/language/testdata/rfc1034identifier.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.Utilities
 
 CppApplication {
diff --git a/tests/auto/language/testdata/subdir/exports-mylib.qbs b/tests/auto/language/testdata/subdir/exports-mylib.qbs
index 51e5b6831..92f39483a 100644
--- a/tests/auto/language/testdata/subdir/exports-mylib.qbs
+++ b/tests/auto/language/testdata/subdir/exports-mylib.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 StaticLibrary {
     name: "mylib"
     Depends { name: "dummy" }
diff --git a/tests/auto/language/testdata/subdir2/exports-mylib2.qbs b/tests/auto/language/testdata/subdir2/exports-mylib2.qbs
index a0cec6eb0..ac8b9ebe4 100644
--- a/tests/auto/language/testdata/subdir2/exports-mylib2.qbs
+++ b/tests/auto/language/testdata/subdir2/exports-mylib2.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 StaticLibrary {
     name: "mylib2"
     Depends { name: "dummy" }
diff --git a/tests/auto/language/testdata/suppressed-and-non-suppressed-errors.qbs b/tests/auto/language/testdata/suppressed-and-non-suppressed-errors.qbs
index dd1794a6d..4d5219157 100644
--- a/tests/auto/language/testdata/suppressed-and-non-suppressed-errors.qbs
+++ b/tests/auto/language/testdata/suppressed-and-non-suppressed-errors.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     CppApplication {
         name: "mysterious creature"
diff --git a/tests/auto/language/testdata/throwing-probe.qbs b/tests/auto/language/testdata/throwing-probe.qbs
index 1fe059828..15a953251 100644
--- a/tests/auto/language/testdata/throwing-probe.qbs
+++ b/tests/auto/language/testdata/throwing-probe.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     name: "theProduct"
     property bool enableProbe
diff --git a/tests/auto/language/testdata/versionCompare.qbs b/tests/auto/language/testdata/versionCompare.qbs
index 0a7271d14..8a363bf6e 100644
--- a/tests/auto/language/testdata/versionCompare.qbs
+++ b/tests/auto/language/testdata/versionCompare.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.Utilities
 
 Product {
diff --git a/tests/auto/language/tst_language.cpp b/tests/auto/language/tst_language.cpp
index 323ae763b..c17526ad8 100644
--- a/tests/auto/language/tst_language.cpp
+++ b/tests/auto/language/tst_language.cpp
@@ -742,7 +742,7 @@ void TestLanguage::erroneousFiles_data()
     QTest::newRow("throw_in_property_binding")
             << "something is wrong";
     QTest::newRow("no-configure-in-probe")
-            << "no-configure-in-probe.qbs:4:5.*Probe.configure must be set";
+            << "no-configure-in-probe.qbs:2:5.*Probe.configure must be set";
     QTest::newRow("dependency_cycle")
             << "Cyclic dependencies detected.";
     QTest::newRow("dependency_cycle2")
@@ -786,18 +786,18 @@ void TestLanguage::erroneousFiles_data()
             << "Conflicting fileTagsFilter in Group items";
     QTest::newRow("duplicate_sources")
             << "Duplicate source file '.*main.cpp'"
-               ".*duplicate_sources.qbs:4:12.*duplicate_sources.qbs:6:16.";
+               ".*duplicate_sources.qbs:2:12.*duplicate_sources.qbs:4:16.";
     QTest::newRow("duplicate_sources_wildcards")
             << "Duplicate source file '.*duplicate_sources_wildcards.qbs'"
-               ".*duplicate_sources_wildcards.qbs:4:12"
-               ".*duplicate_sources_wildcards.qbs:6:16.";
+               ".*duplicate_sources_wildcards.qbs:2:12"
+               ".*duplicate_sources_wildcards.qbs:4:16.";
     QTest::newRow("oldQbsVersion")
             << "The project requires at least qbs version \\d+\\.\\d+.\\d+, "
                "but this is qbs version " QBS_VERSION ".";
     QTest::newRow("wrongQbsVersionFormat")
             << "The value '.*' of Project.minimumQbsVersion is not a valid version string.";
     QTest::newRow("properties-item-with-invalid-condition")
-            << "properties-item-with-invalid-condition.qbs:6:19.*TypeError: Result of expression "
+            << "properties-item-with-invalid-condition.qbs:4:19.*TypeError: Result of expression "
                "'cpp.nonexistingproperty'";
     QTest::newRow("misused-inherited-property") << "Binding to non-item property";
     QTest::newRow("undeclared_property_in_Properties_item") << "Item 'blubb' is not declared";
@@ -812,26 +812,26 @@ void TestLanguage::erroneousFiles_data()
     QTest::newRow("missing-colon")
             << "Invalid item 'cpp.dynamicLibraries'. Did you mean to set a module property?";
     QTest::newRow("syntax-error-in-probe")
-            << "syntax-error-in-probe.qbs:6:20.*ReferenceError";
+            << "syntax-error-in-probe.qbs:4:20.*ReferenceError";
     QTest::newRow("wrong-toplevel-item")
-            << "wrong-toplevel-item.qbs:3:1.*The top-level item must be of type 'Project' or "
+            << "wrong-toplevel-item.qbs:1:1.*The top-level item must be of type 'Project' or "
                "'Product', but it is of type 'Artifact'.";
     QTest::newRow("conflicting-module-instances")
             << "There is more than one equally prioritized candidate for module "
                "'conflicting-instances'.";
     QTest::newRow("module-depends-on-product")
-            << "module-with-product-dependency.qbs:4:5.*Modules cannot depend on products.";
+            << "module-with-product-dependency.qbs:2:5.*Modules cannot depend on products.";
     QTest::newRow("overwrite-inherited-readonly-property")
             << "overwrite-inherited-readonly-property.qbs"
-               ":4:21.*Cannot set read-only property 'readOnlyString'.";
+               ":2:21.*Cannot set read-only property 'readOnlyString'.";
     QTest::newRow("overwrite-readonly-module-property")
             << "overwrite-readonly-module-property.qbs"
-               ":5:30.*Cannot set read-only property 'readOnlyString'.";
+               ":3:30.*Cannot set read-only property 'readOnlyString'.";
     QTest::newRow("original-in-product-property")
             << "original-in-product-property.qbs"
-               ":4:21.*The special value 'original' can only be used with module properties.";
+               ":2:21.*The special value 'original' can only be used with module properties.";
     QTest::newRow("rule-without-output-tags")
-            << "rule-without-output-tags.qbs:4:5.*A rule needs to have Artifact items or "
+            << "rule-without-output-tags.qbs:2:5.*A rule needs to have Artifact items or "
                "a non-empty outputFileTags property.";
     QTest::newRow("original-in-module-prototype")
             << "module-with-invalid-original.qbs:2:24.*The special value 'original' cannot be used "
@@ -840,7 +840,7 @@ void TestLanguage::erroneousFiles_data()
             << "original-in-export-item.qbs:7:32.*The special value 'original' cannot be used "
                "on the right-hand side of a property declaration.";
     QTest::newRow("mismatching-multiplex-dependency")
-            << "mismatching-multiplex-dependency.qbs:9:5.*Dependency from product "
+            << "mismatching-multiplex-dependency.qbs:7:5.*Dependency from product "
                "'b \\{\"architecture\":\"mips\"\\}' to product 'a \\{\"architecture\":\"mips\"\\}'"
                " not fulfilled.";
     QTest::newRow("duplicate-multiplex-value")
@@ -849,7 +849,7 @@ void TestLanguage::erroneousFiles_data()
             << "duplicate-multiplex-value2.qbs:3:1.*Duplicate entry 'architecture' in "
                "Product.multiplexByQbsProperties.";
     QTest::newRow("invalid-references")
-            << "invalid-references.qbs:4:17.*Cannot open '.*nosuchproject.qbs'";
+            << "invalid-references.qbs:2:17.*Cannot open '.*nosuchproject.qbs'";
 }
 
 void TestLanguage::erroneousFiles()
@@ -1284,8 +1284,8 @@ void TestLanguage::idUniqueness()
         const QList<ErrorItem> items = e.items();
         QCOMPARE(items.size(), 3);
         QCOMPARE(items.at(0).toString(), QString::fromUtf8("The id 'baseProduct' is not unique."));
-        QVERIFY(items.at(1).toString().contains("id-uniqueness.qbs:6:5 First occurrence is here."));
-        QVERIFY(items.at(2).toString().contains("id-uniqueness.qbs:9:5 Next occurrence is here."));
+        QVERIFY(items.at(1).toString().contains("id-uniqueness.qbs:5:5 First occurrence is here."));
+        QVERIFY(items.at(2).toString().contains("id-uniqueness.qbs:8:5 Next occurrence is here."));
     }
     QVERIFY(exceptionCaught);
 }