diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-06-22 10:05:12 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-06-22 10:07:27 +0000 |
| commit | 8cd4d92b2e2757225f06e76999afb57acc63629a (patch) | |
| tree | 1ce2473a3c4e2588e6b5167cd2f3a7947624bc2b /tests/auto | |
| parent | e3ef6758205349a5be04e2d7b13507c617ec32fe (diff) | |
| download | qbs-8cd4d92b2e2757225f06e76999afb57acc63629a.tar.gz | |
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>
Diffstat (limited to 'tests/auto')
656 files changed, 24 insertions, 1171 deletions
diff --git a/tests/auto/api/testdata/QBS-728/QBS-728.qbs b/tests/auto/api/testdata/QBS-728/QBS-728.qbs index a3090f7ae..5969e13cc 100644 --- a/tests/auto/api/testdata/QBS-728/QBS-728.qbs +++ b/tests/auto/api/testdata/QBS-728/QBS-728.qbs @@ -1,5 +1,3 @@ -import qbs - Product { property bool isBlubbOS: qbs.targetOS.contains("blubb-OS") qbs.profiles: isBlubbOS ? ["blubb-profile"] : [project.profile] diff --git a/tests/auto/api/testdata/add-qobject-macro-to-cpp-file/add-qobject-macro-to-cpp-file.qbs b/tests/auto/api/testdata/add-qobject-macro-to-cpp-file/add-qobject-macro-to-cpp-file.qbs index 40c5395ef..3794408b4 100644 --- a/tests/auto/api/testdata/add-qobject-macro-to-cpp-file/add-qobject-macro-to-cpp-file.qbs +++ b/tests/auto/api/testdata/add-qobject-macro-to-cpp-file/add-qobject-macro-to-cpp-file.qbs @@ -1,5 +1,3 @@ -import qbs - QtApplication { files: ["main.cpp", "object.h", "object.cpp"] } diff --git a/tests/auto/api/testdata/added-file-persistent/added-file-persistent.qbs b/tests/auto/api/testdata/added-file-persistent/added-file-persistent.qbs index 672886646..1f3b28f9b 100644 --- a/tests/auto/api/testdata/added-file-persistent/added-file-persistent.qbs +++ b/tests/auto/api/testdata/added-file-persistent/added-file-persistent.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { files: [ 'main.cpp', diff --git a/tests/auto/api/testdata/app-without-sources/app-without-sources.qbs b/tests/auto/api/testdata/app-without-sources/app-without-sources.qbs index f12a28fe6..a366e0ce0 100644 --- a/tests/auto/api/testdata/app-without-sources/app-without-sources.qbs +++ b/tests/auto/api/testdata/app-without-sources/app-without-sources.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { StaticLibrary { name: "a" diff --git a/tests/auto/api/testdata/base-properties/imports/Bar.qbs b/tests/auto/api/testdata/base-properties/imports/Bar.qbs index 07ab724e4..cef4cb463 100644 --- a/tests/auto/api/testdata/base-properties/imports/Bar.qbs +++ b/tests/auto/api/testdata/base-properties/imports/Bar.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Product { Depends { name: "cpp" } cpp.defines: ["FROM_BAR"] diff --git a/tests/auto/api/testdata/base-properties/imports/Foo.qbs b/tests/auto/api/testdata/base-properties/imports/Foo.qbs index f177a17c3..1d90a1c10 100644 --- a/tests/auto/api/testdata/base-properties/imports/Foo.qbs +++ b/tests/auto/api/testdata/base-properties/imports/Foo.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Bar { type: "application" consoleApplication: true diff --git a/tests/auto/api/testdata/base-properties/prj.qbs b/tests/auto/api/testdata/base-properties/prj.qbs index a43b930dc..f7035ba0f 100644 --- a/tests/auto/api/testdata/base-properties/prj.qbs +++ b/tests/auto/api/testdata/base-properties/prj.qbs @@ -1,4 +1,3 @@ -import qbs 1.0 import "imports/Foo.qbs" as Foo Project { diff --git a/tests/auto/api/testdata/build-error-code-location/build-error-code-location.qbs b/tests/auto/api/testdata/build-error-code-location/build-error-code-location.qbs index f51e91e1f..afa7e1f2a 100644 --- a/tests/auto/api/testdata/build-error-code-location/build-error-code-location.qbs +++ b/tests/auto/api/testdata/build-error-code-location/build-error-code-location.qbs @@ -1,5 +1,3 @@ -import qbs - Product { name: "p" type: ["p.out"] diff --git a/tests/auto/api/testdata/build-properties-source/build-properties-source.qbs b/tests/auto/api/testdata/build-properties-source/build-properties-source.qbs index 49f565b29..3237e90dc 100644 --- a/tests/auto/api/testdata/build-properties-source/build-properties-source.qbs +++ b/tests/auto/api/testdata/build-properties-source/build-properties-source.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { Product { type: "application" diff --git a/tests/auto/api/testdata/build-single-file/build-single-file.qbs b/tests/auto/api/testdata/build-single-file/build-single-file.qbs index 6389713d9..903a52f9d 100644 --- a/tests/auto/api/testdata/build-single-file/build-single-file.qbs +++ b/tests/auto/api/testdata/build-single-file/build-single-file.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.TextFile CppApplication { diff --git a/tests/auto/api/testdata/buildgraph-info/buildgraph-info.qbs b/tests/auto/api/testdata/buildgraph-info/buildgraph-info.qbs index 8828f3a19..d1762513e 100644 --- a/tests/auto/api/testdata/buildgraph-info/buildgraph-info.qbs +++ b/tests/auto/api/testdata/buildgraph-info/buildgraph-info.qbs @@ -1,5 +1,3 @@ -import qbs - Product { qbs.shellPath: "/bin/bash" } diff --git a/tests/auto/api/testdata/buildgraph-locking/buildgraph-locking.qbs b/tests/auto/api/testdata/buildgraph-locking/buildgraph-locking.qbs index e08b008bc..5e7259ea6 100644 --- a/tests/auto/api/testdata/buildgraph-locking/buildgraph-locking.qbs +++ b/tests/auto/api/testdata/buildgraph-locking/buildgraph-locking.qbs @@ -1,4 +1,2 @@ -import qbs - Project { } diff --git a/tests/auto/api/testdata/change-dependent-lib/change-dependent-lib.qbs b/tests/auto/api/testdata/change-dependent-lib/change-dependent-lib.qbs index f52c90055..222dc4476 100644 --- a/tests/auto/api/testdata/change-dependent-lib/change-dependent-lib.qbs +++ b/tests/auto/api/testdata/change-dependent-lib/change-dependent-lib.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { Application { name : "HelloWorld" diff --git a/tests/auto/api/testdata/check-outputs/check-outputs.qbs b/tests/auto/api/testdata/check-outputs/check-outputs.qbs index 27eada48f..519a95ea8 100644 --- a/tests/auto/api/testdata/check-outputs/check-outputs.qbs +++ b/tests/auto/api/testdata/check-outputs/check-outputs.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.File Project { diff --git a/tests/auto/api/testdata/codegen/codegen.qbs b/tests/auto/api/testdata/codegen/codegen.qbs index fac13f860..d8a217572 100644 --- a/tests/auto/api/testdata/codegen/codegen.qbs +++ b/tests/auto/api/testdata/codegen/codegen.qbs @@ -1,4 +1,3 @@ -import qbs 1.0 import qbs.FileInfo Project { diff --git a/tests/auto/api/testdata/command-extraction/command-extraction.qbs b/tests/auto/api/testdata/command-extraction/command-extraction.qbs index 73b66aaa0..253992dd0 100644 --- a/tests/auto/api/testdata/command-extraction/command-extraction.qbs +++ b/tests/auto/api/testdata/command-extraction/command-extraction.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { files: "main.cpp" } diff --git a/tests/auto/api/testdata/disabled-product/disabled-product.qbs b/tests/auto/api/testdata/disabled-product/disabled-product.qbs index c57615c10..dad8f5d4c 100644 --- a/tests/auto/api/testdata/disabled-product/disabled-product.qbs +++ b/tests/auto/api/testdata/disabled-product/disabled-product.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { condition: false files: "main.cpp" diff --git a/tests/auto/api/testdata/disabled-project/disabled-project.qbs b/tests/auto/api/testdata/disabled-project/disabled-project.qbs index 1461b70ad..49f35be94 100644 --- a/tests/auto/api/testdata/disabled-project/disabled-project.qbs +++ b/tests/auto/api/testdata/disabled-project/disabled-project.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.File Project { diff --git a/tests/auto/api/testdata/disabled_install_group/disabled_install_group.qbs b/tests/auto/api/testdata/disabled_install_group/disabled_install_group.qbs index b80af6e8a..c300f6390 100644 --- a/tests/auto/api/testdata/disabled_install_group/disabled_install_group.qbs +++ b/tests/auto/api/testdata/disabled_install_group/disabled_install_group.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { consoleApplication: true files: "main.cpp" diff --git a/tests/auto/api/testdata/duplicate-product-names/explicit.qbs b/tests/auto/api/testdata/duplicate-product-names/explicit.qbs index 0183b411c..b9a97bf53 100644 --- a/tests/auto/api/testdata/duplicate-product-names/explicit.qbs +++ b/tests/auto/api/testdata/duplicate-product-names/explicit.qbs @@ -1,5 +1,3 @@ -import qbs - Project { Product { name: "blubb" } Product { name: "blubb" } diff --git a/tests/auto/api/testdata/duplicate-product-names/implicit-indirect.qbs b/tests/auto/api/testdata/duplicate-product-names/implicit-indirect.qbs index 7164aa1c5..bc651c076 100644 --- a/tests/auto/api/testdata/duplicate-product-names/implicit-indirect.qbs +++ b/tests/auto/api/testdata/duplicate-product-names/implicit-indirect.qbs @@ -1,5 +1,3 @@ -import qbs - Project { references: ["subdir1/subproject.qbs", "subdir2/subproject.qbs"] } diff --git a/tests/auto/api/testdata/duplicate-product-names/implicit.qbs b/tests/auto/api/testdata/duplicate-product-names/implicit.qbs index f39f80626..409af1ab8 100644 --- a/tests/auto/api/testdata/duplicate-product-names/implicit.qbs +++ b/tests/auto/api/testdata/duplicate-product-names/implicit.qbs @@ -1,5 +1,3 @@ -import qbs - Project { Product { } Product { } diff --git a/tests/auto/api/testdata/duplicate-product-names/subdir1/subproject.qbs b/tests/auto/api/testdata/duplicate-product-names/subdir1/subproject.qbs index 6d16a3c53..86718b571 100644 --- a/tests/auto/api/testdata/duplicate-product-names/subdir1/subproject.qbs +++ b/tests/auto/api/testdata/duplicate-product-names/subdir1/subproject.qbs @@ -1,3 +1 @@ -import qbs - Product { } diff --git a/tests/auto/api/testdata/duplicate-product-names/subdir2/subproject.qbs b/tests/auto/api/testdata/duplicate-product-names/subdir2/subproject.qbs index 6d16a3c53..86718b571 100644 --- a/tests/auto/api/testdata/duplicate-product-names/subdir2/subproject.qbs +++ b/tests/auto/api/testdata/duplicate-product-names/subdir2/subproject.qbs @@ -1,3 +1 @@ -import qbs - Product { } diff --git a/tests/auto/api/testdata/empty-filetag-list/empty-filetag-list.qbs b/tests/auto/api/testdata/empty-filetag-list/empty-filetag-list.qbs index 294616124..a13065db0 100644 --- a/tests/auto/api/testdata/empty-filetag-list/empty-filetag-list.qbs +++ b/tests/auto/api/testdata/empty-filetag-list/empty-filetag-list.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { Group { files: "dontcompilethis.cpp" diff --git a/tests/auto/api/testdata/empty-submodules-list/empty-submodules-list.qbs b/tests/auto/api/testdata/empty-submodules-list/empty-submodules-list.qbs index 88b5e3177..b39b1ebcc 100644 --- a/tests/auto/api/testdata/empty-submodules-list/empty-submodules-list.qbs +++ b/tests/auto/api/testdata/empty-submodules-list/empty-submodules-list.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { Depends { name: "dummy" diff --git a/tests/auto/api/testdata/enable-and-disable-product/enable-and-disable-product.qbs b/tests/auto/api/testdata/enable-and-disable-product/enable-and-disable-product.qbs index 4afa1e25e..fc90377af 100644 --- a/tests/auto/api/testdata/enable-and-disable-product/enable-and-disable-product.qbs +++ b/tests/auto/api/testdata/enable-and-disable-product/enable-and-disable-product.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { property string prop: undefined // Influences source artifact properties and the product condition condition: prop diff --git a/tests/auto/api/testdata/error-in-setup-run-environment/error-in-setup-run-environment.qbs b/tests/auto/api/testdata/error-in-setup-run-environment/error-in-setup-run-environment.qbs index f3247f6f8..63a79551b 100644 --- a/tests/auto/api/testdata/error-in-setup-run-environment/error-in-setup-run-environment.qbs +++ b/tests/auto/api/testdata/error-in-setup-run-environment/error-in-setup-run-environment.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { Depends { name: "mymodule" } } diff --git a/tests/auto/api/testdata/error-in-setup-run-environment/modules/mymodule/mymodule.qbs b/tests/auto/api/testdata/error-in-setup-run-environment/modules/mymodule/mymodule.qbs index e698b45b5..1b136fdb9 100644 --- a/tests/auto/api/testdata/error-in-setup-run-environment/modules/mymodule/mymodule.qbs +++ b/tests/auto/api/testdata/error-in-setup-run-environment/modules/mymodule/mymodule.qbs @@ -1,5 +1,3 @@ -import qbs - Module { setupRunEnvironment: { trallala diff --git a/tests/auto/api/testdata/excluded-inputs/excluded-inputs.qbs b/tests/auto/api/testdata/excluded-inputs/excluded-inputs.qbs index faa51d3b9..7633b3ebe 100644 --- a/tests/auto/api/testdata/excluded-inputs/excluded-inputs.qbs +++ b/tests/auto/api/testdata/excluded-inputs/excluded-inputs.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.File import qbs.TextFile diff --git a/tests/auto/api/testdata/explicitly-depends-on/explicitly-depends-on.qbs b/tests/auto/api/testdata/explicitly-depends-on/explicitly-depends-on.qbs index 17aa74697..05886a99e 100644 --- a/tests/auto/api/testdata/explicitly-depends-on/explicitly-depends-on.qbs +++ b/tests/auto/api/testdata/explicitly-depends-on/explicitly-depends-on.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.FileInfo import qbs.TextFile diff --git a/tests/auto/api/testdata/export-item-with-group/export-item-with-group.qbs b/tests/auto/api/testdata/export-item-with-group/export-item-with-group.qbs index 30f1868cb..b2079e95f 100644 --- a/tests/auto/api/testdata/export-item-with-group/export-item-with-group.qbs +++ b/tests/auto/api/testdata/export-item-with-group/export-item-with-group.qbs @@ -1,5 +1,3 @@ -import qbs - Project { Product { name: "dep" diff --git a/tests/auto/api/testdata/export-simple/export-simple.qbs b/tests/auto/api/testdata/export-simple/export-simple.qbs index d07bb0d1a..01177049d 100644 --- a/tests/auto/api/testdata/export-simple/export-simple.qbs +++ b/tests/auto/api/testdata/export-simple/export-simple.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { Application { name : "HelloWorld" diff --git a/tests/auto/api/testdata/export-with-recursive-depends/export-with-recursive-depends.qbs b/tests/auto/api/testdata/export-with-recursive-depends/export-with-recursive-depends.qbs index d5f5f79e5..937a73e21 100644 --- a/tests/auto/api/testdata/export-with-recursive-depends/export-with-recursive-depends.qbs +++ b/tests/auto/api/testdata/export-with-recursive-depends/export-with-recursive-depends.qbs @@ -1,5 +1,3 @@ -import qbs - Project { CppApplication { name: "app1" diff --git a/tests/auto/api/testdata/export-with-recursive-depends/modules/module1/module1.qbs b/tests/auto/api/testdata/export-with-recursive-depends/modules/module1/module1.qbs index c1c4ad358..c7aadde69 100644 --- a/tests/auto/api/testdata/export-with-recursive-depends/modules/module1/module1.qbs +++ b/tests/auto/api/testdata/export-with-recursive-depends/modules/module1/module1.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Depends { name: "module2" } } diff --git a/tests/auto/api/testdata/export-with-recursive-depends/modules/module2/module2.qbs b/tests/auto/api/testdata/export-with-recursive-depends/modules/module2/module2.qbs index 75a274631..2b5f6014e 100644 --- a/tests/auto/api/testdata/export-with-recursive-depends/modules/module2/module2.qbs +++ b/tests/auto/api/testdata/export-with-recursive-depends/modules/module2/module2.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Depends { name: "cpp" } cpp.defines: ["HAS_FOO"] diff --git a/tests/auto/api/testdata/fallback-gcc/fallback-gcc.qbs b/tests/auto/api/testdata/fallback-gcc/fallback-gcc.qbs index 8b3b63e65..e2fb255ad 100644 --- a/tests/auto/api/testdata/fallback-gcc/fallback-gcc.qbs +++ b/tests/auto/api/testdata/fallback-gcc/fallback-gcc.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { name: "app" cpp._skipAllChecks: true diff --git a/tests/auto/api/testdata/file-tagger/moc_cpp.qbs b/tests/auto/api/testdata/file-tagger/moc_cpp.qbs index fd07730dc..43fa5f330 100644 --- a/tests/auto/api/testdata/file-tagger/moc_cpp.qbs +++ b/tests/auto/api/testdata/file-tagger/moc_cpp.qbs @@ -1,4 +1,3 @@ -import qbs 1.0 import qbs.TextFile import qbs.FileInfo diff --git a/tests/auto/api/testdata/filetagsfilter_override/InstalledApp.qbs b/tests/auto/api/testdata/filetagsfilter_override/InstalledApp.qbs index 633410c3c..21db6b37a 100644 --- a/tests/auto/api/testdata/filetagsfilter_override/InstalledApp.qbs +++ b/tests/auto/api/testdata/filetagsfilter_override/InstalledApp.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { type: "application" consoleApplication: true diff --git a/tests/auto/api/testdata/filetagsfilter_override/filetagsfilter_override.qbs b/tests/auto/api/testdata/filetagsfilter_override/filetagsfilter_override.qbs index a6cec7d07..6483e8851 100644 --- a/tests/auto/api/testdata/filetagsfilter_override/filetagsfilter_override.qbs +++ b/tests/auto/api/testdata/filetagsfilter_override/filetagsfilter_override.qbs @@ -1,4 +1,3 @@ -import qbs import "InstalledApp.qbs" as InstalledApp InstalledApp { diff --git a/tests/auto/api/testdata/generated-files-list/generated-files-list.qbs b/tests/auto/api/testdata/generated-files-list/generated-files-list.qbs index 30f7bc695..666d72645 100644 --- a/tests/auto/api/testdata/generated-files-list/generated-files-list.qbs +++ b/tests/auto/api/testdata/generated-files-list/generated-files-list.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { Depends { name: "Qt.widgets" } consoleApplication: true diff --git a/tests/auto/api/testdata/infinite-loop-js/infinite-loop.qbs b/tests/auto/api/testdata/infinite-loop-js/infinite-loop.qbs index 592c602ec..bb616a9e2 100644 --- a/tests/auto/api/testdata/infinite-loop-js/infinite-loop.qbs +++ b/tests/auto/api/testdata/infinite-loop-js/infinite-loop.qbs @@ -1,5 +1,3 @@ -import qbs - Product { type: "mytype" Rule { diff --git a/tests/auto/api/testdata/infinite-loop-process/infinite-loop.qbs b/tests/auto/api/testdata/infinite-loop-process/infinite-loop.qbs index fb09b9a97..f0de12df1 100644 --- a/tests/auto/api/testdata/infinite-loop-process/infinite-loop.qbs +++ b/tests/auto/api/testdata/infinite-loop-process/infinite-loop.qbs @@ -1,5 +1,3 @@ -import qbs - Project { CppApplication { type: "application" diff --git a/tests/auto/api/testdata/infinite-loop-resolving/infinite-loop-resolving.qbs b/tests/auto/api/testdata/infinite-loop-resolving/infinite-loop-resolving.qbs index b690f5041..e9d0db418 100644 --- a/tests/auto/api/testdata/infinite-loop-resolving/infinite-loop-resolving.qbs +++ b/tests/auto/api/testdata/infinite-loop-resolving/infinite-loop-resolving.qbs @@ -1,5 +1,3 @@ -import qbs - Product { type: { while (true); return "Haha!"; } } diff --git a/tests/auto/api/testdata/inherit-qbs-search-paths/imports/Foo.qbs b/tests/auto/api/testdata/inherit-qbs-search-paths/imports/Foo.qbs index 9493b04b5..8920c0fc6 100644 --- a/tests/auto/api/testdata/inherit-qbs-search-paths/imports/Foo.qbs +++ b/tests/auto/api/testdata/inherit-qbs-search-paths/imports/Foo.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Product { type: "application" consoleApplication: true diff --git a/tests/auto/api/testdata/inherit-qbs-search-paths/prj.qbs b/tests/auto/api/testdata/inherit-qbs-search-paths/prj.qbs index 0e8162809..d79a1ed70 100644 --- a/tests/auto/api/testdata/inherit-qbs-search-paths/prj.qbs +++ b/tests/auto/api/testdata/inherit-qbs-search-paths/prj.qbs @@ -1,4 +1,3 @@ -import qbs 1.0 import "imports/Foo.qbs" as Foo Project { diff --git a/tests/auto/api/testdata/inherit-qbs-search-paths/subdir/modules/bli/m.qbs b/tests/auto/api/testdata/inherit-qbs-search-paths/subdir/modules/bli/m.qbs index b4b93678a..34ac9e8e9 100644 --- a/tests/auto/api/testdata/inherit-qbs-search-paths/subdir/modules/bli/m.qbs +++ b/tests/auto/api/testdata/inherit-qbs-search-paths/subdir/modules/bli/m.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Module { Depends {name : "cpp" } cpp.defines: ["HAVE_BLI"] diff --git a/tests/auto/api/testdata/inherit-qbs-search-paths/subdir2/modules/bla/m.qbs b/tests/auto/api/testdata/inherit-qbs-search-paths/subdir2/modules/bla/m.qbs index 0676d0c4d..de93f18e8 100644 --- a/tests/auto/api/testdata/inherit-qbs-search-paths/subdir2/modules/bla/m.qbs +++ b/tests/auto/api/testdata/inherit-qbs-search-paths/subdir2/modules/bla/m.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Module { Depends {name : "cpp" } cpp.defines: ["HAVE_BLA"] diff --git a/tests/auto/api/testdata/installed-artifact/installed-artifact.qbs b/tests/auto/api/testdata/installed-artifact/installed-artifact.qbs index 4a355c385..d3f91662a 100644 --- a/tests/auto/api/testdata/installed-artifact/installed-artifact.qbs +++ b/tests/auto/api/testdata/installed-artifact/installed-artifact.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { CppApplication { diff --git a/tests/auto/api/testdata/is-runnable/is-runnable.qbs b/tests/auto/api/testdata/is-runnable/is-runnable.qbs index 2883328ed..870279294 100644 --- a/tests/auto/api/testdata/is-runnable/is-runnable.qbs +++ b/tests/auto/api/testdata/is-runnable/is-runnable.qbs @@ -1,5 +1,3 @@ -import qbs - Project { CppApplication { name: "app" diff --git a/tests/auto/api/testdata/lib-same-source/lib-same-source.qbs b/tests/auto/api/testdata/lib-same-source/lib-same-source.qbs index dc5785e98..97a614eb8 100644 --- a/tests/auto/api/testdata/lib-same-source/lib-same-source.qbs +++ b/tests/auto/api/testdata/lib-same-source/lib-same-source.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { Product { type: "application" diff --git a/tests/auto/api/testdata/link-dynamiclibs-staticlibs/link-dynamiclibs-staticlibs.qbs b/tests/auto/api/testdata/link-dynamiclibs-staticlibs/link-dynamiclibs-staticlibs.qbs index 8fec45700..b2a54080c 100644 --- a/tests/auto/api/testdata/link-dynamiclibs-staticlibs/link-dynamiclibs-staticlibs.qbs +++ b/tests/auto/api/testdata/link-dynamiclibs-staticlibs/link-dynamiclibs-staticlibs.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { Application { name : "HelloWorld" diff --git a/tests/auto/api/testdata/link-dynamiclibs/link-dynamiclibs.qbs b/tests/auto/api/testdata/link-dynamiclibs/link-dynamiclibs.qbs index d6047060c..cc86a4402 100644 --- a/tests/auto/api/testdata/link-dynamiclibs/link-dynamiclibs.qbs +++ b/tests/auto/api/testdata/link-dynamiclibs/link-dynamiclibs.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { Application { name : "HelloWorld" diff --git a/tests/auto/api/testdata/link-static-lib/link-static-lib.qbs b/tests/auto/api/testdata/link-static-lib/link-static-lib.qbs index 6840a4cc6..6960c7d17 100644 --- a/tests/auto/api/testdata/link-static-lib/link-static-lib.qbs +++ b/tests/auto/api/testdata/link-static-lib/link-static-lib.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { Product { type: "application" diff --git a/tests/auto/api/testdata/link-staticlib-dynamiclib/link-staticlib-dynamiclib.qbs b/tests/auto/api/testdata/link-staticlib-dynamiclib/link-staticlib-dynamiclib.qbs index a14cde651..8573b2f60 100644 --- a/tests/auto/api/testdata/link-staticlib-dynamiclib/link-staticlib-dynamiclib.qbs +++ b/tests/auto/api/testdata/link-staticlib-dynamiclib/link-staticlib-dynamiclib.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { CppApplication { Depends { name: "mystaticlib" } diff --git a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/link-staticlibs-dynamiclibs.qbs b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/link-staticlibs-dynamiclibs.qbs index eafa764ba..eade97126 100644 --- a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/link-staticlibs-dynamiclibs.qbs +++ b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/link-staticlibs-dynamiclibs.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { Application { name : "HelloWorld" diff --git a/tests/auto/api/testdata/local-profiles/local-profiles.qbs b/tests/auto/api/testdata/local-profiles/local-profiles.qbs index 7832cab58..c6091f9f5 100644 --- a/tests/auto/api/testdata/local-profiles/local-profiles.qbs +++ b/tests/auto/api/testdata/local-profiles/local-profiles.qbs @@ -1,5 +1,3 @@ -import qbs - Project { property string windowsProfile: "windowsProfile" property bool enableProfiles diff --git a/tests/auto/api/testdata/lots-of-dots/lots-of-dots.qbs b/tests/auto/api/testdata/lots-of-dots/lots-of-dots.qbs index 904cbcf66..096fcaf0c 100644 --- a/tests/auto/api/testdata/lots-of-dots/lots-of-dots.qbs +++ b/tests/auto/api/testdata/lots-of-dots/lots-of-dots.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { QtGuiApplication { type: "application" diff --git a/tests/auto/api/testdata/missing-source-file/missing-source-file.qbs b/tests/auto/api/testdata/missing-source-file/missing-source-file.qbs index db666f9fd..bc17bc7dd 100644 --- a/tests/auto/api/testdata/missing-source-file/missing-source-file.qbs +++ b/tests/auto/api/testdata/missing-source-file/missing-source-file.qbs @@ -1,5 +1,3 @@ -import qbs - Product { files: [ "file1.txt", diff --git a/tests/auto/api/testdata/moc-cpp/moc-cpp.qbs b/tests/auto/api/testdata/moc-cpp/moc-cpp.qbs index f8ee0736b..a6445a399 100644 --- a/tests/auto/api/testdata/moc-cpp/moc-cpp.qbs +++ b/tests/auto/api/testdata/moc-cpp/moc-cpp.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { Product { type: "application" diff --git a/tests/auto/api/testdata/moc-hpp-included/moc-hpp-included.qbs b/tests/auto/api/testdata/moc-hpp-included/moc-hpp-included.qbs index b954d09f0..a484b9c22 100644 --- a/tests/auto/api/testdata/moc-hpp-included/moc-hpp-included.qbs +++ b/tests/auto/api/testdata/moc-hpp-included/moc-hpp-included.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { Product { type: "application" diff --git a/tests/auto/api/testdata/moc-hpp/moc-hpp.qbs b/tests/auto/api/testdata/moc-hpp/moc-hpp.qbs index f90ee4240..27120aade 100644 --- a/tests/auto/api/testdata/moc-hpp/moc-hpp.qbs +++ b/tests/auto/api/testdata/moc-hpp/moc-hpp.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { Product { type: "application" diff --git a/tests/auto/api/testdata/multi-arch/multi-arch.qbs b/tests/auto/api/testdata/multi-arch/multi-arch.qbs index 99d9aa817..71a66dfc7 100644 --- a/tests/auto/api/testdata/multi-arch/multi-arch.qbs +++ b/tests/auto/api/testdata/multi-arch/multi-arch.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.FileInfo import qbs.TextFile diff --git a/tests/auto/api/testdata/multiplexing/multiplexing.qbs b/tests/auto/api/testdata/multiplexing/multiplexing.qbs index 3d099eb7a..8011e4250 100644 --- a/tests/auto/api/testdata/multiplexing/multiplexing.qbs +++ b/tests/auto/api/testdata/multiplexing/multiplexing.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.TextFile Project { diff --git a/tests/auto/api/testdata/new-output-artifact-in-dependency/new-output-artifact-in-dependency.qbs b/tests/auto/api/testdata/new-output-artifact-in-dependency/new-output-artifact-in-dependency.qbs index 8b50cce2a..5c3e475b0 100644 --- a/tests/auto/api/testdata/new-output-artifact-in-dependency/new-output-artifact-in-dependency.qbs +++ b/tests/auto/api/testdata/new-output-artifact-in-dependency/new-output-artifact-in-dependency.qbs @@ -1,5 +1,3 @@ -import qbs - Project { DynamicLibrary { //Depends { name: "cpp" } diff --git a/tests/auto/api/testdata/new-pattern-match/new-pattern-match.qbs b/tests/auto/api/testdata/new-pattern-match/new-pattern-match.qbs index 18975da75..f4e0856f9 100644 --- a/tests/auto/api/testdata/new-pattern-match/new-pattern-match.qbs +++ b/tests/auto/api/testdata/new-pattern-match/new-pattern-match.qbs @@ -1,5 +1,3 @@ -import qbs - Product { files: "*.txt" } diff --git a/tests/auto/api/testdata/nonexistingprojectproperties/invalidaccessfromproduct.qbs b/tests/auto/api/testdata/nonexistingprojectproperties/invalidaccessfromproduct.qbs index c024b3c2c..5f479c1c5 100644 --- a/tests/auto/api/testdata/nonexistingprojectproperties/invalidaccessfromproduct.qbs +++ b/tests/auto/api/testdata/nonexistingprojectproperties/invalidaccessfromproduct.qbs @@ -1,3 +1 @@ -import qbs - Project { Product { type: project.blubb } } diff --git a/tests/auto/api/testdata/nonexistingprojectproperties/nonexistingprojectproperties.qbs b/tests/auto/api/testdata/nonexistingprojectproperties/nonexistingprojectproperties.qbs index 7d453a671..ba86b0ab7 100644 --- a/tests/auto/api/testdata/nonexistingprojectproperties/nonexistingprojectproperties.qbs +++ b/tests/auto/api/testdata/nonexistingprojectproperties/nonexistingprojectproperties.qbs @@ -1,3 +1 @@ -import qbs - Project { } diff --git a/tests/auto/api/testdata/objc/objc.qbs b/tests/auto/api/testdata/objc/objc.qbs index c88d4693c..845eb8d32 100644 --- a/tests/auto/api/testdata/objc/objc.qbs +++ b/tests/auto/api/testdata/objc/objc.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { CppApplication { condition: qbs.targetOS.contains("macos") diff --git a/tests/auto/api/testdata/precompiled-header-dynamic/precompiled-header-dynamic.qbs b/tests/auto/api/testdata/precompiled-header-dynamic/precompiled-header-dynamic.qbs index 46de774b9..2fd58d24e 100644 --- a/tests/auto/api/testdata/precompiled-header-dynamic/precompiled-header-dynamic.qbs +++ b/tests/auto/api/testdata/precompiled-header-dynamic/precompiled-header-dynamic.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.File CppApplication { diff --git a/tests/auto/api/testdata/precompiled-header-new/precompiled-header-new.qbs b/tests/auto/api/testdata/precompiled-header-new/precompiled-header-new.qbs index bb82ed248..059400a21 100644 --- a/tests/auto/api/testdata/precompiled-header-new/precompiled-header-new.qbs +++ b/tests/auto/api/testdata/precompiled-header-new/precompiled-header-new.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - CppApplication { name: "MyApp" consoleApplication: true diff --git a/tests/auto/api/testdata/process-result/process-result.qbs b/tests/auto/api/testdata/process-result/process-result.qbs index 24fc595bc..84706ace8 100644 --- a/tests/auto/api/testdata/process-result/process-result.qbs +++ b/tests/auto/api/testdata/process-result/process-result.qbs @@ -1,5 +1,3 @@ -import qbs - Project { CppApplication { name: "app" diff --git a/tests/auto/api/testdata/productNameWithDots/productNameWithDots.qbs b/tests/auto/api/testdata/productNameWithDots/productNameWithDots.qbs index 5e3427793..972598c42 100644 --- a/tests/auto/api/testdata/productNameWithDots/productNameWithDots.qbs +++ b/tests/auto/api/testdata/productNameWithDots/productNameWithDots.qbs @@ -1,4 +1,3 @@ -import qbs Project { CppApplication { name: "myapp" diff --git a/tests/auto/api/testdata/project-data-after-product-invalidation/project-data-after-product-invalidation.qbs b/tests/auto/api/testdata/project-data-after-product-invalidation/project-data-after-product-invalidation.qbs index be68cac47..1794205b4 100644 --- a/tests/auto/api/testdata/project-data-after-product-invalidation/project-data-after-product-invalidation.qbs +++ b/tests/auto/api/testdata/project-data-after-product-invalidation/project-data-after-product-invalidation.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { name: "theProduct" files: [ diff --git a/tests/auto/api/testdata/project-editing/project-editing.qbs b/tests/auto/api/testdata/project-editing/project-editing.qbs index 57cb30355..f8c0aef46 100644 --- a/tests/auto/api/testdata/project-editing/project-editing.qbs +++ b/tests/auto/api/testdata/project-editing/project-editing.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { Group { name: "Existing Group 1" diff --git a/tests/auto/api/testdata/project-editing/project-with-no-files.qbs b/tests/auto/api/testdata/project-editing/project-with-no-files.qbs index 824ae6dcd..b12ac6813 100644 --- a/tests/auto/api/testdata/project-editing/project-with-no-files.qbs +++ b/tests/auto/api/testdata/project-editing/project-with-no-files.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { Group { files: "file.cpp" diff --git a/tests/auto/api/testdata/project-invalidation/project.early-error.qbs b/tests/auto/api/testdata/project-invalidation/project.early-error.qbs index ecc76c816..701da0eab 100644 --- a/tests/auto/api/testdata/project-invalidation/project.early-error.qbs +++ b/tests/auto/api/testdata/project-invalidation/project.early-error.qbs @@ -1,5 +1,3 @@ -import qbs - Product { type: "mytype" files: "nosuchfile.txt" diff --git a/tests/auto/api/testdata/project-invalidation/project.late-error.qbs b/tests/auto/api/testdata/project-invalidation/project.late-error.qbs index 6bce6f2d3..ce033adbd 100644 --- a/tests/auto/api/testdata/project-invalidation/project.late-error.qbs +++ b/tests/auto/api/testdata/project-invalidation/project.late-error.qbs @@ -1,5 +1,3 @@ -import qbs - Product { type: "mytype" diff --git a/tests/auto/api/testdata/project-invalidation/project.no-error.qbs b/tests/auto/api/testdata/project-invalidation/project.no-error.qbs index 099553ffc..f37cbd64b 100644 --- a/tests/auto/api/testdata/project-invalidation/project.no-error.qbs +++ b/tests/auto/api/testdata/project-invalidation/project.no-error.qbs @@ -1,5 +1,3 @@ -import qbs - Product { type: "mytype" } diff --git a/tests/auto/api/testdata/project-locking/project-locking.qbs b/tests/auto/api/testdata/project-locking/project-locking.qbs index e08b008bc..5e7259ea6 100644 --- a/tests/auto/api/testdata/project-locking/project-locking.qbs +++ b/tests/auto/api/testdata/project-locking/project-locking.qbs @@ -1,4 +1,2 @@ -import qbs - Project { } diff --git a/tests/auto/api/testdata/project-properties-by-name/project-properties-by-name.qbs b/tests/auto/api/testdata/project-properties-by-name/project-properties-by-name.qbs index b90068f87..0bc9d3eab 100644 --- a/tests/auto/api/testdata/project-properties-by-name/project-properties-by-name.qbs +++ b/tests/auto/api/testdata/project-properties-by-name/project-properties-by-name.qbs @@ -1,5 +1,3 @@ -import qbs - Project { name: "toplevel" property stringList theDefines: [] diff --git a/tests/auto/api/testdata/project-with-properties-item/project-with-properties-item.qbs b/tests/auto/api/testdata/project-with-properties-item/project-with-properties-item.qbs index 91d5de42f..866ec4ecb 100644 --- a/tests/auto/api/testdata/project-with-properties-item/project-with-properties-item.qbs +++ b/tests/auto/api/testdata/project-with-properties-item/project-with-properties-item.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { property string binPath: "/usr/bin" property string libPath: "/usr/lib" diff --git a/tests/auto/api/testdata/properties-blocks/properties-blocks.qbs b/tests/auto/api/testdata/properties-blocks/properties-blocks.qbs index 1b4c3680a..dda4652d2 100644 --- a/tests/auto/api/testdata/properties-blocks/properties-blocks.qbs +++ b/tests/auto/api/testdata/properties-blocks/properties-blocks.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Product { Depends { name: 'cpp' } diff --git a/tests/auto/api/testdata/rc/rc.qbs b/tests/auto/api/testdata/rc/rc.qbs index 3a5ce9cab..5b49c5de9 100644 --- a/tests/auto/api/testdata/rc/rc.qbs +++ b/tests/auto/api/testdata/rc/rc.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Application { type: "application" consoleApplication: true diff --git a/tests/auto/api/testdata/referenced-file-errors/cycle.qbs b/tests/auto/api/testdata/referenced-file-errors/cycle.qbs index 72ad2b8b8..ec1a90921 100644 --- a/tests/auto/api/testdata/referenced-file-errors/cycle.qbs +++ b/tests/auto/api/testdata/referenced-file-errors/cycle.qbs @@ -1,5 +1,3 @@ -import qbs - Project { property string productName: "p1" Product { name: project.productName } diff --git a/tests/auto/api/testdata/referenced-file-errors/modules/brokenmodule/brokenmodule.qbs b/tests/auto/api/testdata/referenced-file-errors/modules/brokenmodule/brokenmodule.qbs index 861a73931..b52f12ccd 100644 --- a/tests/auto/api/testdata/referenced-file-errors/modules/brokenmodule/brokenmodule.qbs +++ b/tests/auto/api/testdata/referenced-file-errors/modules/brokenmodule/brokenmodule.qbs @@ -1,5 +1,3 @@ -import qbs - Module { syntax error } diff --git a/tests/auto/api/testdata/referenced-file-errors/okay.qbs b/tests/auto/api/testdata/referenced-file-errors/okay.qbs index 6ec8b1edd..4f88b3990 100644 --- a/tests/auto/api/testdata/referenced-file-errors/okay.qbs +++ b/tests/auto/api/testdata/referenced-file-errors/okay.qbs @@ -1,3 +1 @@ -import qbs - Product { name: "p2" } diff --git a/tests/auto/api/testdata/referenced-file-errors/okay2.qbs b/tests/auto/api/testdata/referenced-file-errors/okay2.qbs index f3b92dd93..0c5b26750 100644 --- a/tests/auto/api/testdata/referenced-file-errors/okay2.qbs +++ b/tests/auto/api/testdata/referenced-file-errors/okay2.qbs @@ -1,3 +1 @@ -import qbs - Product { name: "p4" } diff --git a/tests/auto/api/testdata/referenced-file-errors/referenced-file-errors.qbs b/tests/auto/api/testdata/referenced-file-errors/referenced-file-errors.qbs index b6b255ab3..eb33f1452 100644 --- a/tests/auto/api/testdata/referenced-file-errors/referenced-file-errors.qbs +++ b/tests/auto/api/testdata/referenced-file-errors/referenced-file-errors.qbs @@ -1,5 +1,3 @@ -import qbs - Project { references: [ "ambiguousdir", diff --git a/tests/auto/api/testdata/referenced-file-errors/wrongtype.qbs b/tests/auto/api/testdata/referenced-file-errors/wrongtype.qbs index 9322b53b1..cd8c6471d 100644 --- a/tests/auto/api/testdata/referenced-file-errors/wrongtype.qbs +++ b/tests/auto/api/testdata/referenced-file-errors/wrongtype.qbs @@ -1,3 +1 @@ -import qbs - Module { } diff --git a/tests/auto/api/testdata/references/invalid1.qbs b/tests/auto/api/testdata/references/invalid1.qbs index 4bbb26d3a..ec4095d83 100644 --- a/tests/auto/api/testdata/references/invalid1.qbs +++ b/tests/auto/api/testdata/references/invalid1.qbs @@ -1,5 +1,3 @@ -import qbs - Project { references: "subdir-with-no-project" }
\ No newline at end of file diff --git a/tests/auto/api/testdata/references/invalid2.qbs b/tests/auto/api/testdata/references/invalid2.qbs index 1946e2221..249c80b4f 100644 --- a/tests/auto/api/testdata/references/invalid2.qbs +++ b/tests/auto/api/testdata/references/invalid2.qbs @@ -1,5 +1,3 @@ -import qbs - Project { references: "subdir-with-multiple-projects" }
\ No newline at end of file diff --git a/tests/auto/api/testdata/references/subdir-with-one-project/p.qbs b/tests/auto/api/testdata/references/subdir-with-one-project/p.qbs index 7d453a671..ba86b0ab7 100644 --- a/tests/auto/api/testdata/references/subdir-with-one-project/p.qbs +++ b/tests/auto/api/testdata/references/subdir-with-one-project/p.qbs @@ -1,3 +1 @@ -import qbs - Project { } diff --git a/tests/auto/api/testdata/references/valid.qbs b/tests/auto/api/testdata/references/valid.qbs index 43d728a4d..97ed7f564 100644 --- a/tests/auto/api/testdata/references/valid.qbs +++ b/tests/auto/api/testdata/references/valid.qbs @@ -1,5 +1,3 @@ -import qbs - Project { references: "subdir-with-one-project" } diff --git a/tests/auto/api/testdata/relaxed-mode-recovery/relaxed-mode-recovery.qbs b/tests/auto/api/testdata/relaxed-mode-recovery/relaxed-mode-recovery.qbs index b9e786a4b..7a066b694 100644 --- a/tests/auto/api/testdata/relaxed-mode-recovery/relaxed-mode-recovery.qbs +++ b/tests/auto/api/testdata/relaxed-mode-recovery/relaxed-mode-recovery.qbs @@ -1,5 +1,3 @@ -import qbs - Project { Product { name: "dep" diff --git a/tests/auto/api/testdata/remove-file-dependency/removeFileDependency.qbs b/tests/auto/api/testdata/remove-file-dependency/removeFileDependency.qbs index 8ed927761..27bdf96c2 100644 --- a/tests/auto/api/testdata/remove-file-dependency/removeFileDependency.qbs +++ b/tests/auto/api/testdata/remove-file-dependency/removeFileDependency.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { files: ["main.cpp"] // Do not reference header files here to force them to be FileDependency objects. diff --git a/tests/auto/api/testdata/rename-product/rename.qbs b/tests/auto/api/testdata/rename-product/rename.qbs index 3e5d2da28..9d23bf804 100644 --- a/tests/auto/api/testdata/rename-product/rename.qbs +++ b/tests/auto/api/testdata/rename-product/rename.qbs @@ -1,5 +1,3 @@ -import qbs - Project { CppApplication { Depends { name: "TheLib" } diff --git a/tests/auto/api/testdata/rename-target-artifact/rename.qbs b/tests/auto/api/testdata/rename-target-artifact/rename.qbs index c5f267ed6..810b0eb08 100644 --- a/tests/auto/api/testdata/rename-target-artifact/rename.qbs +++ b/tests/auto/api/testdata/rename-target-artifact/rename.qbs @@ -1,5 +1,3 @@ -import qbs - Project { CppApplication { Depends { name: "TheLib" } diff --git a/tests/auto/api/testdata/restored-warnings/restored-warnings.qbs b/tests/auto/api/testdata/restored-warnings/restored-warnings.qbs index 2de943eda..bbdfbeadb 100644 --- a/tests/auto/api/testdata/restored-warnings/restored-warnings.qbs +++ b/tests/auto/api/testdata/restored-warnings/restored-warnings.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Process 1.5 CppApplication { diff --git a/tests/auto/api/testdata/rule-conflict/rule-conflict.qbs b/tests/auto/api/testdata/rule-conflict/rule-conflict.qbs index 5b839076e..7bd462f18 100644 --- a/tests/auto/api/testdata/rule-conflict/rule-conflict.qbs +++ b/tests/auto/api/testdata/rule-conflict/rule-conflict.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { files: "main.cpp" Group { diff --git a/tests/auto/api/testdata/run-disabled-product/run-disabled-product.qbs b/tests/auto/api/testdata/run-disabled-product/run-disabled-product.qbs index 7cdcf7db1..b187084dd 100644 --- a/tests/auto/api/testdata/run-disabled-product/run-disabled-product.qbs +++ b/tests/auto/api/testdata/run-disabled-product/run-disabled-product.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { name: "app" condition: false diff --git a/tests/auto/api/testdata/same-base-name/same-base-name.qbs b/tests/auto/api/testdata/same-base-name/same-base-name.qbs index c6a7a6fa3..8448d04fd 100644 --- a/tests/auto/api/testdata/same-base-name/same-base-name.qbs +++ b/tests/auto/api/testdata/same-base-name/same-base-name.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { CppApplication { type: "application" diff --git a/tests/auto/api/testdata/simple-probe/simple-probe.qbs b/tests/auto/api/testdata/simple-probe/simple-probe.qbs index 34700a99b..8e76acfe3 100644 --- a/tests/auto/api/testdata/simple-probe/simple-probe.qbs +++ b/tests/auto/api/testdata/simple-probe/simple-probe.qbs @@ -1,4 +1,3 @@ -import qbs 1.0 import qbs.Probes CppApplication { diff --git a/tests/auto/api/testdata/soft-dependency/soft-dependency.qbs b/tests/auto/api/testdata/soft-dependency/soft-dependency.qbs index bbf37fda8..62713a481 100644 --- a/tests/auto/api/testdata/soft-dependency/soft-dependency.qbs +++ b/tests/auto/api/testdata/soft-dependency/soft-dependency.qbs @@ -1,5 +1,3 @@ -import qbs - Application { Depends { name: "nosuchmodule" diff --git a/tests/auto/api/testdata/source-file-in-build-dir/source-file-in-build-dir.qbs b/tests/auto/api/testdata/source-file-in-build-dir/source-file-in-build-dir.qbs index 9fe39cdba..85115fc78 100644 --- a/tests/auto/api/testdata/source-file-in-build-dir/source-file-in-build-dir.qbs +++ b/tests/auto/api/testdata/source-file-in-build-dir/source-file-in-build-dir.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.TextFile CppApplication { diff --git a/tests/auto/api/testdata/static-lib-deps/static-lib-deps.qbs b/tests/auto/api/testdata/static-lib-deps/static-lib-deps.qbs index c925d4d57..b584b4d41 100644 --- a/tests/auto/api/testdata/static-lib-deps/static-lib-deps.qbs +++ b/tests/auto/api/testdata/static-lib-deps/static-lib-deps.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { StaticLibrary { name: "a" diff --git a/tests/auto/api/testdata/subprojects/resources/modules/QtCoreDepender/qtcoredepender.qbs b/tests/auto/api/testdata/subprojects/resources/modules/QtCoreDepender/qtcoredepender.qbs index 328abaa99..906193adf 100644 --- a/tests/auto/api/testdata/subprojects/resources/modules/QtCoreDepender/qtcoredepender.qbs +++ b/tests/auto/api/testdata/subprojects/resources/modules/QtCoreDepender/qtcoredepender.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Depends { name: "cute.core" } } diff --git a/tests/auto/api/testdata/subprojects/resources/modules/cute/core/core.qbs b/tests/auto/api/testdata/subprojects/resources/modules/cute/core/core.qbs index 6ad30f229..ae9b47211 100644 --- a/tests/auto/api/testdata/subprojects/resources/modules/cute/core/core.qbs +++ b/tests/auto/api/testdata/subprojects/resources/modules/cute/core/core.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Depends { name: "cpp" } cpp.includePaths: [path] diff --git a/tests/auto/api/testdata/subprojects/subproject2/subproject2.qbs b/tests/auto/api/testdata/subprojects/subproject2/subproject2.qbs index 3046fe4b2..b0abb38bd 100644 --- a/tests/auto/api/testdata/subprojects/subproject2/subproject2.qbs +++ b/tests/auto/api/testdata/subprojects/subproject2/subproject2.qbs @@ -1,5 +1,3 @@ -import qbs - Project { name: "subproject2" property string libNamePrefix: "test" diff --git a/tests/auto/api/testdata/subprojects/subproject2/subproject3/subproject3.qbs b/tests/auto/api/testdata/subprojects/subproject2/subproject3/subproject3.qbs index 58a09e863..f2c637947 100644 --- a/tests/auto/api/testdata/subprojects/subproject2/subproject3/subproject3.qbs +++ b/tests/auto/api/testdata/subprojects/subproject2/subproject3/subproject3.qbs @@ -1,4 +1,3 @@ -import qbs import LibraryType Project { diff --git a/tests/auto/api/testdata/subprojects/toplevelproject.qbs b/tests/auto/api/testdata/subprojects/toplevelproject.qbs index f167ccabc..402e40501 100644 --- a/tests/auto/api/testdata/subprojects/toplevelproject.qbs +++ b/tests/auto/api/testdata/subprojects/toplevelproject.qbs @@ -1,5 +1,3 @@ -import qbs - Project { name: "top level project" references: ["subproject2"] diff --git a/tests/auto/api/testdata/tool-in-module/use-outside-project/modules/thetool/thetool.qbs b/tests/auto/api/testdata/tool-in-module/use-outside-project/modules/thetool/thetool.qbs index 9521f3ae4..d72ebda17 100644 --- a/tests/auto/api/testdata/tool-in-module/use-outside-project/modules/thetool/thetool.qbs +++ b/tests/auto/api/testdata/tool-in-module/use-outside-project/modules/thetool/thetool.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.FileInfo Module { diff --git a/tests/auto/api/testdata/tool-in-module/use-outside-project/use-outside-project.qbs b/tests/auto/api/testdata/tool-in-module/use-outside-project/use-outside-project.qbs index 439e68f51..81db730db 100644 --- a/tests/auto/api/testdata/tool-in-module/use-outside-project/use-outside-project.qbs +++ b/tests/auto/api/testdata/tool-in-module/use-outside-project/use-outside-project.qbs @@ -1,5 +1,3 @@ -import qbs - Product { name: "user-outside-project" type: ["thetool.output"] diff --git a/tests/auto/api/testdata/tool-in-module/use-within-project/use-within-project.qbs b/tests/auto/api/testdata/tool-in-module/use-within-project/use-within-project.qbs index bbeb29664..575f4020e 100644 --- a/tests/auto/api/testdata/tool-in-module/use-within-project/use-within-project.qbs +++ b/tests/auto/api/testdata/tool-in-module/use-within-project/use-within-project.qbs @@ -1,5 +1,3 @@ -import qbs - Project { CppApplication { name: "thetool" diff --git a/tests/auto/api/testdata/transformer-data/transformer-data.qbs b/tests/auto/api/testdata/transformer-data/transformer-data.qbs index b24deebe5..f9433ed73 100644 --- a/tests/auto/api/testdata/transformer-data/transformer-data.qbs +++ b/tests/auto/api/testdata/transformer-data/transformer-data.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.File import qbs.TextFile diff --git a/tests/auto/api/testdata/transformers/transformers.qbs b/tests/auto/api/testdata/transformers/transformers.qbs index 999395445..bbc5c3c65 100644 --- a/tests/auto/api/testdata/transformers/transformers.qbs +++ b/tests/auto/api/testdata/transformers/transformers.qbs @@ -1,4 +1,3 @@ -import qbs 1.0 import qbs.File import qbs.TextFile import qbs.Xml diff --git a/tests/auto/api/testdata/two-default-property-values/modules/mymodule/mymodule.qbs b/tests/auto/api/testdata/two-default-property-values/modules/mymodule/mymodule.qbs index 52e99e24d..8ac7b75a3 100644 --- a/tests/auto/api/testdata/two-default-property-values/modules/mymodule/mymodule.qbs +++ b/tests/auto/api/testdata/two-default-property-values/modules/mymodule/mymodule.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.TextFile Module { diff --git a/tests/auto/api/testdata/two-default-property-values/modules/myothermodule/myothermodule.qbs b/tests/auto/api/testdata/two-default-property-values/modules/myothermodule/myothermodule.qbs index e0ec699df..12df4434b 100644 --- a/tests/auto/api/testdata/two-default-property-values/modules/myothermodule/myothermodule.qbs +++ b/tests/auto/api/testdata/two-default-property-values/modules/myothermodule/myothermodule.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Depends { name: "mymodule" } } diff --git a/tests/auto/api/testdata/two-default-property-values/two-default-property-values.qbs b/tests/auto/api/testdata/two-default-property-values/two-default-property-values.qbs index c0bc720f7..5e3e0f5a7 100644 --- a/tests/auto/api/testdata/two-default-property-values/two-default-property-values.qbs +++ b/tests/auto/api/testdata/two-default-property-values/two-default-property-values.qbs @@ -1,5 +1,3 @@ -import qbs - Product { name: "two-default-property-values" type: "mymodule" diff --git a/tests/auto/api/testdata/type-change/type-change.qbs b/tests/auto/api/testdata/type-change/type-change.qbs index 7661aa305..e8154b836 100644 --- a/tests/auto/api/testdata/type-change/type-change.qbs +++ b/tests/auto/api/testdata/type-change/type-change.qbs @@ -1,5 +1,3 @@ -import qbs - Product { files: "main.cpp" Depends { name: "cpp" } diff --git a/tests/auto/api/testdata/uic/uic.qbs b/tests/auto/api/testdata/uic/uic.qbs index 301cdad44..50260d73b 100644 --- a/tests/auto/api/testdata/uic/uic.qbs +++ b/tests/auto/api/testdata/uic/uic.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { QtGuiApplication { type: "application" diff --git a/tests/auto/api/tst_api.cpp b/tests/auto/api/tst_api.cpp index 7af87fc32..01578346a 100644 --- a/tests/auto/api/tst_api.cpp +++ b/tests/auto/api/tst_api.cpp @@ -285,7 +285,7 @@ void TestApi::buildErrorCodeLocation() QString("Rule.outputArtifacts must return an array of objects.")); const qbs::CodeLocation errorLoc = errorItem.codeLocation(); QCOMPARE(QFileInfo(errorLoc.filePath()).fileName(), QString("build-error-code-location.qbs")); - QCOMPARE(errorLoc.line(), 9); + QCOMPARE(errorLoc.line(), 7); QCOMPARE(errorLoc.column(), 26); } diff --git a/tests/auto/blackbox/blackbox-android.qbs b/tests/auto/blackbox/blackbox-android.qbs index 068322cf9..ca7d429ef 100644 --- a/tests/auto/blackbox/blackbox-android.qbs +++ b/tests/auto/blackbox/blackbox-android.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Utilities QbsAutotest { diff --git a/tests/auto/blackbox/blackbox-apple.qbs b/tests/auto/blackbox/blackbox-apple.qbs index 8137aec82..6cc946d12 100644 --- a/tests/auto/blackbox/blackbox-apple.qbs +++ b/tests/auto/blackbox/blackbox-apple.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Utilities QbsAutotest { diff --git a/tests/auto/blackbox/blackbox-clangdb.qbs b/tests/auto/blackbox/blackbox-clangdb.qbs index 359fad1db..38118309f 100644 --- a/tests/auto/blackbox/blackbox-clangdb.qbs +++ b/tests/auto/blackbox/blackbox-clangdb.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Utilities QbsAutotest { diff --git a/tests/auto/blackbox/blackbox-java.qbs b/tests/auto/blackbox/blackbox-java.qbs index b75a5f168..6c56b3d18 100644 --- a/tests/auto/blackbox/blackbox-java.qbs +++ b/tests/auto/blackbox/blackbox-java.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Utilities QbsAutotest { diff --git a/tests/auto/blackbox/blackbox-qt.qbs b/tests/auto/blackbox/blackbox-qt.qbs index ad473f731..a25221dc9 100644 --- a/tests/auto/blackbox/blackbox-qt.qbs +++ b/tests/auto/blackbox/blackbox-qt.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Utilities QbsAutotest { diff --git a/tests/auto/blackbox/blackbox.qbs b/tests/auto/blackbox/blackbox.qbs index 917e8345b..3f0ff959a 100644 --- a/tests/auto/blackbox/blackbox.qbs +++ b/tests/auto/blackbox/blackbox.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Utilities QbsAutotest { diff --git a/tests/auto/blackbox/find/find-android.qbs b/tests/auto/blackbox/find/find-android.qbs index 5a28b0560..07849c680 100644 --- a/tests/auto/blackbox/find/find-android.qbs +++ b/tests/auto/blackbox/find/find-android.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.TextFile Product { diff --git a/tests/auto/blackbox/find/find-jdk.qbs b/tests/auto/blackbox/find/find-jdk.qbs index 411569f23..81d84fa20 100644 --- a/tests/auto/blackbox/find/find-jdk.qbs +++ b/tests/auto/blackbox/find/find-jdk.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.TextFile Product { diff --git a/tests/auto/blackbox/find/find-nodejs.qbs b/tests/auto/blackbox/find/find-nodejs.qbs index d8b555ecd..c63d40c81 100644 --- a/tests/auto/blackbox/find/find-nodejs.qbs +++ b/tests/auto/blackbox/find/find-nodejs.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.TextFile Product { diff --git a/tests/auto/blackbox/find/find-typescript.qbs b/tests/auto/blackbox/find/find-typescript.qbs index df2f86a84..18ca0c5cc 100644 --- a/tests/auto/blackbox/find/find-typescript.qbs +++ b/tests/auto/blackbox/find/find-typescript.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.TextFile Product { diff --git a/tests/auto/blackbox/find/find-xcode.qbs b/tests/auto/blackbox/find/find-xcode.qbs index b42b2deb7..bb6ee9718 100644 --- a/tests/auto/blackbox/find/find-xcode.qbs +++ b/tests/auto/blackbox/find/find-xcode.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.TextFile Product { diff --git a/tests/auto/blackbox/testdata-android/multiple-apks-per-project/multiple-apks-per-project.qbs b/tests/auto/blackbox/testdata-android/multiple-apks-per-project/multiple-apks-per-project.qbs index 3d03c309a..5dc5ad269 100644 --- a/tests/auto/blackbox/testdata-android/multiple-apks-per-project/multiple-apks-per-project.qbs +++ b/tests/auto/blackbox/testdata-android/multiple-apks-per-project/multiple-apks-per-project.qbs @@ -1,5 +1,3 @@ -import qbs - Project { references: [ "product1", diff --git a/tests/auto/blackbox/testdata-android/multiple-apks-per-project/product1/product1.qbs b/tests/auto/blackbox/testdata-android/multiple-apks-per-project/product1/product1.qbs index 63256af54..ad544085d 100644 --- a/tests/auto/blackbox/testdata-android/multiple-apks-per-project/product1/product1.qbs +++ b/tests/auto/blackbox/testdata-android/multiple-apks-per-project/product1/product1.qbs @@ -1,5 +1,3 @@ -import qbs - Project { DynamicLibrary { Depends { name: "Android.ndk" } diff --git a/tests/auto/blackbox/testdata-android/multiple-apks-per-project/product2/product2.qbs b/tests/auto/blackbox/testdata-android/multiple-apks-per-project/product2/product2.qbs index a4f94f671..af7d01489 100644 --- a/tests/auto/blackbox/testdata-android/multiple-apks-per-project/product2/product2.qbs +++ b/tests/auto/blackbox/testdata-android/multiple-apks-per-project/product2/product2.qbs @@ -1,5 +1,3 @@ -import qbs - Project { DynamicLibrary { Depends { name: "cpp" } diff --git a/tests/auto/blackbox/testdata-android/multiple-libs-per-apk/multiple-libs-per-apk.qbs b/tests/auto/blackbox/testdata-android/multiple-libs-per-apk/multiple-libs-per-apk.qbs index 499a5111b..6da74e556 100644 --- a/tests/auto/blackbox/testdata-android/multiple-libs-per-apk/multiple-libs-per-apk.qbs +++ b/tests/auto/blackbox/testdata-android/multiple-libs-per-apk/multiple-libs-per-apk.qbs @@ -1,5 +1,3 @@ -import qbs - Project { DynamicLibrary { Depends { name: "Android.ndk" } diff --git a/tests/auto/blackbox/testdata-android/no-native/no-native.qbs b/tests/auto/blackbox/testdata-android/no-native/no-native.qbs index 2909adc0c..9f32a4fa5 100644 --- a/tests/auto/blackbox/testdata-android/no-native/no-native.qbs +++ b/tests/auto/blackbox/testdata-android/no-native/no-native.qbs @@ -1,5 +1,3 @@ -import qbs - AndroidApk { name: "com.example.android.basicmediadecoder" diff --git a/tests/auto/blackbox/testdata-android/teapot/teapot.qbs b/tests/auto/blackbox/testdata-android/teapot/teapot.qbs index 4a447b2cc..81772fb71 100644 --- a/tests/auto/blackbox/testdata-android/teapot/teapot.qbs +++ b/tests/auto/blackbox/testdata-android/teapot/teapot.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.File Project { diff --git a/tests/auto/blackbox/testdata-apple/apple-dmg/apple-dmg.qbs b/tests/auto/blackbox/testdata-apple/apple-dmg/apple-dmg.qbs index 010e5f7c7..b3d39fe27 100644 --- a/tests/auto/blackbox/testdata-apple/apple-dmg/apple-dmg.qbs +++ b/tests/auto/blackbox/testdata-apple/apple-dmg/apple-dmg.qbs @@ -1,5 +1,3 @@ -import qbs - Project { AppleApplicationDiskImage { Depends { name: "myapp" } diff --git a/tests/auto/blackbox/testdata-apple/apple-multiconfig/apple-multiconfig.qbs b/tests/auto/blackbox/testdata-apple/apple-multiconfig/apple-multiconfig.qbs index ea67b6e44..289678dfc 100644 --- a/tests/auto/blackbox/testdata-apple/apple-multiconfig/apple-multiconfig.qbs +++ b/tests/auto/blackbox/testdata-apple/apple-multiconfig/apple-multiconfig.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Utilities Project { diff --git a/tests/auto/blackbox/testdata-apple/bundle-structure/bundle-structure.qbs b/tests/auto/blackbox/testdata-apple/bundle-structure/bundle-structure.qbs index 13a205730..8cf031e33 100644 --- a/tests/auto/blackbox/testdata-apple/bundle-structure/bundle-structure.qbs +++ b/tests/auto/blackbox/testdata-apple/bundle-structure/bundle-structure.qbs @@ -1,5 +1,3 @@ -import qbs - Project { property stringList bundleFileTags: ["bundle.content"] diff --git a/tests/auto/blackbox/testdata-apple/deploymentTarget/deployment.qbs b/tests/auto/blackbox/testdata-apple/deploymentTarget/deployment.qbs index f805de67c..9f1a466df 100644 --- a/tests/auto/blackbox/testdata-apple/deploymentTarget/deployment.qbs +++ b/tests/auto/blackbox/testdata-apple/deploymentTarget/deployment.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { files: ["main.c"] diff --git a/tests/auto/blackbox/testdata-apple/embedInfoPlist/embedInfoPlist.qbs b/tests/auto/blackbox/testdata-apple/embedInfoPlist/embedInfoPlist.qbs index 87f6c1750..ba36d134c 100644 --- a/tests/auto/blackbox/testdata-apple/embedInfoPlist/embedInfoPlist.qbs +++ b/tests/auto/blackbox/testdata-apple/embedInfoPlist/embedInfoPlist.qbs @@ -1,5 +1,3 @@ -import qbs - Project { CppApplication { Depends { name: "lib" } diff --git a/tests/auto/blackbox/testdata-apple/frameworkStructure/frameworkStructure.qbs b/tests/auto/blackbox/testdata-apple/frameworkStructure/frameworkStructure.qbs index 39b3a1b58..a812ae513 100644 --- a/tests/auto/blackbox/testdata-apple/frameworkStructure/frameworkStructure.qbs +++ b/tests/auto/blackbox/testdata-apple/frameworkStructure/frameworkStructure.qbs @@ -1,5 +1,3 @@ -import qbs - Project { property bool includeHeaders: true Library { diff --git a/tests/auto/blackbox/testdata-apple/ib/assetcatalog/assetcatalogempty.qbs b/tests/auto/blackbox/testdata-apple/ib/assetcatalog/assetcatalogempty.qbs index ef67796f9..622fa46cb 100644 --- a/tests/auto/blackbox/testdata-apple/ib/assetcatalog/assetcatalogempty.qbs +++ b/tests/auto/blackbox/testdata-apple/ib/assetcatalog/assetcatalogempty.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Utilities Project { diff --git a/tests/auto/blackbox/testdata-apple/ib/empty-asset-catalogs/multiple-asset-catalogs.qbs b/tests/auto/blackbox/testdata-apple/ib/empty-asset-catalogs/multiple-asset-catalogs.qbs index 454d3c482..49b389d3d 100644 --- a/tests/auto/blackbox/testdata-apple/ib/empty-asset-catalogs/multiple-asset-catalogs.qbs +++ b/tests/auto/blackbox/testdata-apple/ib/empty-asset-catalogs/multiple-asset-catalogs.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { Depends { name: "ib" } files: [ diff --git a/tests/auto/blackbox/testdata-apple/ib/iconset/iconset.qbs b/tests/auto/blackbox/testdata-apple/ib/iconset/iconset.qbs index 1d563f180..b3481587f 100644 --- a/tests/auto/blackbox/testdata-apple/ib/iconset/iconset.qbs +++ b/tests/auto/blackbox/testdata-apple/ib/iconset/iconset.qbs @@ -1,5 +1,3 @@ -import qbs - Product { Depends { name: "ib" } type: ["icns"] diff --git a/tests/auto/blackbox/testdata-apple/ib/iconsetapp/iconsetapp.qbs b/tests/auto/blackbox/testdata-apple/ib/iconsetapp/iconsetapp.qbs index 7e5323a0c..04e6ce0ce 100644 --- a/tests/auto/blackbox/testdata-apple/ib/iconsetapp/iconsetapp.qbs +++ b/tests/auto/blackbox/testdata-apple/ib/iconsetapp/iconsetapp.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { Depends { name: "ib" } files: ["main.c", "white.iconset"] diff --git a/tests/auto/blackbox/testdata-apple/ib/multiple-asset-catalogs/multiple-asset-catalogs.qbs b/tests/auto/blackbox/testdata-apple/ib/multiple-asset-catalogs/multiple-asset-catalogs.qbs index 454d3c482..49b389d3d 100644 --- a/tests/auto/blackbox/testdata-apple/ib/multiple-asset-catalogs/multiple-asset-catalogs.qbs +++ b/tests/auto/blackbox/testdata-apple/ib/multiple-asset-catalogs/multiple-asset-catalogs.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { Depends { name: "ib" } files: [ diff --git a/tests/auto/blackbox/testdata-apple/infoplist/infoplist.qbs b/tests/auto/blackbox/testdata-apple/infoplist/infoplist.qbs index 58cb361dd..a6ac3d8d1 100644 --- a/tests/auto/blackbox/testdata-apple/infoplist/infoplist.qbs +++ b/tests/auto/blackbox/testdata-apple/infoplist/infoplist.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { cpp.minimumMacosVersion: "10.7" files: ["main.c"] diff --git a/tests/auto/blackbox/testdata-apple/objc-arc/objc-arc.qbs b/tests/auto/blackbox/testdata-apple/objc-arc/objc-arc.qbs index 672de3cb5..545d5701c 100644 --- a/tests/auto/blackbox/testdata-apple/objc-arc/objc-arc.qbs +++ b/tests/auto/blackbox/testdata-apple/objc-arc/objc-arc.qbs @@ -1,5 +1,3 @@ -import qbs - Product { Depends { name: "cpp" } consoleApplication: true diff --git a/tests/auto/blackbox/testdata-apple/xcode/xcode-project.qbs b/tests/auto/blackbox/testdata-apple/xcode/xcode-project.qbs index 0c2b0b93d..d7baf8c8e 100644 --- a/tests/auto/blackbox/testdata-apple/xcode/xcode-project.qbs +++ b/tests/auto/blackbox/testdata-apple/xcode/xcode-project.qbs @@ -1,5 +1,3 @@ -import qbs - Project { property stringList sdks: [] diff --git a/tests/auto/blackbox/testdata-clangdb/project1/project.qbs b/tests/auto/blackbox/testdata-clangdb/project1/project.qbs index 4552deb40..ecfc562b0 100644 --- a/tests/auto/blackbox/testdata-clangdb/project1/project.qbs +++ b/tests/auto/blackbox/testdata-clangdb/project1/project.qbs @@ -1,5 +1,3 @@ -import qbs - // $ g++ 'i like spaces.cpp' '-DSPACES="!have \\fun\x5c!\n"' '-DSPICES=%T% # && $$ 1>&2 '\''\n'\''\n' '-DSLICES=(42>24)' && ./a.out // SPACES=!have \fun\! // SPICES=%T% # && $$ 1>&2 '\n' diff --git a/tests/auto/blackbox/testdata-java/java/inner-class/inner-class.qbs b/tests/auto/blackbox/testdata-java/java/inner-class/inner-class.qbs index 5bc861f5d..c48401478 100644 --- a/tests/auto/blackbox/testdata-java/java/inner-class/inner-class.qbs +++ b/tests/auto/blackbox/testdata-java/java/inner-class/inner-class.qbs @@ -1,5 +1,3 @@ -import qbs - JavaJarFile { files: ["**/*.java"] } diff --git a/tests/auto/blackbox/testdata-java/java/vehicles.qbs b/tests/auto/blackbox/testdata-java/java/vehicles.qbs index 4051bb6e4..d4012ba98 100644 --- a/tests/auto/blackbox/testdata-java/java/vehicles.qbs +++ b/tests/auto/blackbox/testdata-java/java/vehicles.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.FileInfo import qbs.Utilities diff --git a/tests/auto/blackbox/testdata-qt/auto-qrc/auto-qrc.qbs b/tests/auto/blackbox/testdata-qt/auto-qrc/auto-qrc.qbs index 63906fd77..e08f89032 100644 --- a/tests/auto/blackbox/testdata-qt/auto-qrc/auto-qrc.qbs +++ b/tests/auto/blackbox/testdata-qt/auto-qrc/auto-qrc.qbs @@ -1,5 +1,3 @@ -import qbs - Project { QtApplication { name: "app" diff --git a/tests/auto/blackbox/testdata-qt/cached-qml/cached-qml.qbs b/tests/auto/blackbox/testdata-qt/cached-qml/cached-qml.qbs index 397c2a691..c95f1190d 100644 --- a/tests/auto/blackbox/testdata-qt/cached-qml/cached-qml.qbs +++ b/tests/auto/blackbox/testdata-qt/cached-qml/cached-qml.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Utilities CppApplication { diff --git a/tests/auto/blackbox/testdata-qt/combined-moc/combined-moc.qbs b/tests/auto/blackbox/testdata-qt/combined-moc/combined-moc.qbs index 34529fce6..acbed1639 100644 --- a/tests/auto/blackbox/testdata-qt/combined-moc/combined-moc.qbs +++ b/tests/auto/blackbox/testdata-qt/combined-moc/combined-moc.qbs @@ -1,5 +1,3 @@ -import qbs - QtApplication { name: "theapp" files: [ diff --git a/tests/auto/blackbox/testdata-qt/dbus-adaptors/car.qbs b/tests/auto/blackbox/testdata-qt/dbus-adaptors/car.qbs index f89a8473b..34aab4701 100644 --- a/tests/auto/blackbox/testdata-qt/dbus-adaptors/car.qbs +++ b/tests/auto/blackbox/testdata-qt/dbus-adaptors/car.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { name: "car" condition: Qt.dbus.present diff --git a/tests/auto/blackbox/testdata-qt/dbus-interfaces/controller.qbs b/tests/auto/blackbox/testdata-qt/dbus-interfaces/controller.qbs index f170d4a20..a1bde7f10 100644 --- a/tests/auto/blackbox/testdata-qt/dbus-interfaces/controller.qbs +++ b/tests/auto/blackbox/testdata-qt/dbus-interfaces/controller.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { name: "controller" condition: Qt.dbus.present diff --git a/tests/auto/blackbox/testdata-qt/lrelease/lrelease.qbs b/tests/auto/blackbox/testdata-qt/lrelease/lrelease.qbs index b4119402f..978aba333 100644 --- a/tests/auto/blackbox/testdata-qt/lrelease/lrelease.qbs +++ b/tests/auto/blackbox/testdata-qt/lrelease/lrelease.qbs @@ -1,5 +1,3 @@ -import qbs - Product { name: "lrelease-test" type: ["ts"] diff --git a/tests/auto/blackbox/testdata-qt/mixed-build-variants/mixed-build-variants.qbs b/tests/auto/blackbox/testdata-qt/mixed-build-variants/mixed-build-variants.qbs index 8f2c1c7fd..7d8ab1b90 100644 --- a/tests/auto/blackbox/testdata-qt/mixed-build-variants/mixed-build-variants.qbs +++ b/tests/auto/blackbox/testdata-qt/mixed-build-variants/mixed-build-variants.qbs @@ -1,5 +1,3 @@ -import qbs - QtApplication { Properties { condition: qbs.toolchain.contains("msvc") diff --git a/tests/auto/blackbox/testdata-qt/moc-and-cxx-combining/moc-and-cxx-combining.qbs b/tests/auto/blackbox/testdata-qt/moc-and-cxx-combining/moc-and-cxx-combining.qbs index 1b0b9f54a..f5463853b 100644 --- a/tests/auto/blackbox/testdata-qt/moc-and-cxx-combining/moc-and-cxx-combining.qbs +++ b/tests/auto/blackbox/testdata-qt/moc-and-cxx-combining/moc-and-cxx-combining.qbs @@ -1,5 +1,3 @@ -import qbs - QtApplication { cpp.combineCxxSources: true files: ["main.cpp", "myobject.h", "myobject.cpp"] diff --git a/tests/auto/blackbox/testdata-qt/moc-flags/moc-flags.qbs b/tests/auto/blackbox/testdata-qt/moc-flags/moc-flags.qbs index d42c7ad87..7cc4e5c4d 100644 --- a/tests/auto/blackbox/testdata-qt/moc-flags/moc-flags.qbs +++ b/tests/auto/blackbox/testdata-qt/moc-flags/moc-flags.qbs @@ -1,5 +1,3 @@ -import qbs - QtApplication { files: ["main.cpp", "blubb.h"] } diff --git a/tests/auto/blackbox/testdata-qt/moc-same-file-name/moc-same-file-name.qbs b/tests/auto/blackbox/testdata-qt/moc-same-file-name/moc-same-file-name.qbs index 42fcff82e..461fec50e 100644 --- a/tests/auto/blackbox/testdata-qt/moc-same-file-name/moc-same-file-name.qbs +++ b/tests/auto/blackbox/testdata-qt/moc-same-file-name/moc-same-file-name.qbs @@ -1,5 +1,3 @@ -import qbs - QtApplication { name: "app" cpp.cxxLanguageVersion: "c++11" diff --git a/tests/auto/blackbox/testdata-qt/pkgconfig/pkgconfig.qbs b/tests/auto/blackbox/testdata-qt/pkgconfig/pkgconfig.qbs index 132ce337a..04b0097ef 100644 --- a/tests/auto/blackbox/testdata-qt/pkgconfig/pkgconfig.qbs +++ b/tests/auto/blackbox/testdata-qt/pkgconfig/pkgconfig.qbs @@ -1,4 +1,3 @@ -import qbs 1.0 import qbs.Probes Project { diff --git a/tests/auto/blackbox/testdata-qt/plugin-meta-data/plugin-meta-data.qbs b/tests/auto/blackbox/testdata-qt/plugin-meta-data/plugin-meta-data.qbs index d44b82d4a..f018b34e0 100644 --- a/tests/auto/blackbox/testdata-qt/plugin-meta-data/plugin-meta-data.qbs +++ b/tests/auto/blackbox/testdata-qt/plugin-meta-data/plugin-meta-data.qbs @@ -1,5 +1,3 @@ -import qbs - Project { QtApplication { name: "app" diff --git a/tests/auto/blackbox/testdata-qt/qml-debugging/qml-debugging.qbs b/tests/auto/blackbox/testdata-qt/qml-debugging/qml-debugging.qbs index 3606b4aa3..8176a7c3e 100644 --- a/tests/auto/blackbox/testdata-qt/qml-debugging/qml-debugging.qbs +++ b/tests/auto/blackbox/testdata-qt/qml-debugging/qml-debugging.qbs @@ -1,5 +1,3 @@ -import qbs - QtApplication { name: "debuggable-app" consoleApplication: true diff --git a/tests/auto/blackbox/testdata-qt/qobject-in-mm/qobject-in-mm.qbs b/tests/auto/blackbox/testdata-qt/qobject-in-mm/qobject-in-mm.qbs index 2f819d012..3ceb8515b 100644 --- a/tests/auto/blackbox/testdata-qt/qobject-in-mm/qobject-in-mm.qbs +++ b/tests/auto/blackbox/testdata-qt/qobject-in-mm/qobject-in-mm.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { Depends { name: "Qt.core" } files: ["main.mm"] diff --git a/tests/auto/blackbox/testdata-qt/qrc/i.qbs b/tests/auto/blackbox/testdata-qt/qrc/i.qbs index 67b836dd4..71e7524e1 100644 --- a/tests/auto/blackbox/testdata-qt/qrc/i.qbs +++ b/tests/auto/blackbox/testdata-qt/qrc/i.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { Product { consoleApplication: true diff --git a/tests/auto/blackbox/testdata-qt/qt-keywords/qt-keywords.qbs b/tests/auto/blackbox/testdata-qt/qt-keywords/qt-keywords.qbs index 59e964258..ddd93827d 100644 --- a/tests/auto/blackbox/testdata-qt/qt-keywords/qt-keywords.qbs +++ b/tests/auto/blackbox/testdata-qt/qt-keywords/qt-keywords.qbs @@ -1,5 +1,3 @@ -import qbs - QtApplication { files: ["main.cpp"] } diff --git a/tests/auto/blackbox/testdata-qt/qtscxml/qtscxml.qbs b/tests/auto/blackbox/testdata-qt/qtscxml/qtscxml.qbs index 4a26550b7..43151bc56 100644 --- a/tests/auto/blackbox/testdata-qt/qtscxml/qtscxml.qbs +++ b/tests/auto/blackbox/testdata-qt/qtscxml/qtscxml.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Environment import qbs.FileInfo diff --git a/tests/auto/blackbox/testdata-qt/quick-compiler/quick-compiler.qbs b/tests/auto/blackbox/testdata-qt/quick-compiler/quick-compiler.qbs index 5f79df581..b141c8672 100644 --- a/tests/auto/blackbox/testdata-qt/quick-compiler/quick-compiler.qbs +++ b/tests/auto/blackbox/testdata-qt/quick-compiler/quick-compiler.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { Depends { name: "Qt.quick" } Qt.quick.useCompiler: Qt.quick.compilerAvailable diff --git a/tests/auto/blackbox/testdata-qt/remove-moc-header-from-file-list/remove-moc-header-from-file-list.qbs b/tests/auto/blackbox/testdata-qt/remove-moc-header-from-file-list/remove-moc-header-from-file-list.qbs index 120f10b0d..b8ac33b96 100644 --- a/tests/auto/blackbox/testdata-qt/remove-moc-header-from-file-list/remove-moc-header-from-file-list.qbs +++ b/tests/auto/blackbox/testdata-qt/remove-moc-header-from-file-list/remove-moc-header-from-file-list.qbs @@ -1,5 +1,3 @@ -import qbs - QtApplication { name: "p" files: [ diff --git a/tests/auto/blackbox/testdata-qt/static-qt-plugin-linking/static-qt-plugin-linking.qbs b/tests/auto/blackbox/testdata-qt/static-qt-plugin-linking/static-qt-plugin-linking.qbs index a72ce0098..ef3edf97f 100644 --- a/tests/auto/blackbox/testdata-qt/static-qt-plugin-linking/static-qt-plugin-linking.qbs +++ b/tests/auto/blackbox/testdata-qt/static-qt-plugin-linking/static-qt-plugin-linking.qbs @@ -1,5 +1,3 @@ -import qbs - StaticLibrary { name: "somelib" Probe { diff --git a/tests/auto/blackbox/testdata-qt/trackAddMocInclude/before/test.qbs b/tests/auto/blackbox/testdata-qt/trackAddMocInclude/before/test.qbs index 0e341c21f..0aa1b1d23 100644 --- a/tests/auto/blackbox/testdata-qt/trackAddMocInclude/before/test.qbs +++ b/tests/auto/blackbox/testdata-qt/trackAddMocInclude/before/test.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Application { Depends { name: "Qt.core" } cpp.cxxLanguageVersion: "c++11" diff --git a/tests/auto/blackbox/testdata-qt/trackQObjChange/i.qbs b/tests/auto/blackbox/testdata-qt/trackQObjChange/i.qbs index c18fab086..348017547 100644 --- a/tests/auto/blackbox/testdata-qt/trackQObjChange/i.qbs +++ b/tests/auto/blackbox/testdata-qt/trackQObjChange/i.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { Product { type: "application" diff --git a/tests/auto/blackbox/testdata-qt/unmocable/unmocable.qbs b/tests/auto/blackbox/testdata-qt/unmocable/unmocable.qbs index bb86fb223..780d27e30 100644 --- a/tests/auto/blackbox/testdata-qt/unmocable/unmocable.qbs +++ b/tests/auto/blackbox/testdata-qt/unmocable/unmocable.qbs @@ -1,5 +1,3 @@ -import qbs - Application { Depends { name: "Qt.core" } files: ["main.cpp"] diff --git a/tests/auto/blackbox/testdata/QTBUG-51237/modules/mymodule/mymodule.qbs b/tests/auto/blackbox/testdata/QTBUG-51237/modules/mymodule/mymodule.qbs index 223da0b3c..55495a950 100644 --- a/tests/auto/blackbox/testdata/QTBUG-51237/modules/mymodule/mymodule.qbs +++ b/tests/auto/blackbox/testdata/QTBUG-51237/modules/mymodule/mymodule.qbs @@ -1,5 +1,3 @@ -import qbs - Module { property stringList theProperty: [] //property stringList otherProperty: theProperty.concat([]) diff --git a/tests/auto/blackbox/testdata/QTBUG-51237/qtbug-51237.qbs b/tests/auto/blackbox/testdata/QTBUG-51237/qtbug-51237.qbs index 33539a5a1..849a943f8 100644 --- a/tests/auto/blackbox/testdata/QTBUG-51237/qtbug-51237.qbs +++ b/tests/auto/blackbox/testdata/QTBUG-51237/qtbug-51237.qbs @@ -1,5 +1,3 @@ -import qbs - Product { type: "custom" Depends { name: "mymodule" } diff --git a/tests/auto/blackbox/testdata/add-filetag-to-generated-artifact/add-filetag-to-generated-artifact.qbs b/tests/auto/blackbox/testdata/add-filetag-to-generated-artifact/add-filetag-to-generated-artifact.qbs index 1bc9b15ef..380e98846 100644 --- a/tests/auto/blackbox/testdata/add-filetag-to-generated-artifact/add-filetag-to-generated-artifact.qbs +++ b/tests/auto/blackbox/testdata/add-filetag-to-generated-artifact/add-filetag-to-generated-artifact.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.File Project { diff --git a/tests/auto/blackbox/testdata/always-run/rule.qbs b/tests/auto/blackbox/testdata/always-run/rule.qbs index 6dbb5c845..7d61e5daf 100644 --- a/tests/auto/blackbox/testdata/always-run/rule.qbs +++ b/tests/auto/blackbox/testdata/always-run/rule.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.TextFile Product { diff --git a/tests/auto/blackbox/testdata/always-run/transformer.qbs b/tests/auto/blackbox/testdata/always-run/transformer.qbs index b5c83eaab..8ae44fb77 100644 --- a/tests/auto/blackbox/testdata/always-run/transformer.qbs +++ b/tests/auto/blackbox/testdata/always-run/transformer.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.TextFile Product { diff --git a/tests/auto/blackbox/testdata/archiver/archivable.qbs b/tests/auto/blackbox/testdata/archiver/archivable.qbs index d6a8e048d..8e521ddf0 100644 --- a/tests/auto/blackbox/testdata/archiver/archivable.qbs +++ b/tests/auto/blackbox/testdata/archiver/archivable.qbs @@ -1,5 +1,3 @@ -import qbs - Product { name: "archivable" type: "archiver.archive" diff --git a/tests/auto/blackbox/testdata/artifact-scanning/artifact-scanning.qbs b/tests/auto/blackbox/testdata/artifact-scanning/artifact-scanning.qbs index 6fa1b5e93..bcd236163 100644 --- a/tests/auto/blackbox/testdata/artifact-scanning/artifact-scanning.qbs +++ b/tests/auto/blackbox/testdata/artifact-scanning/artifact-scanning.qbs @@ -1,5 +1,3 @@ -import qbs - Project { CppApplication { name: "p1" diff --git a/tests/auto/blackbox/testdata/artifacts-map-change-tracking/artifacts-map-change-tracking.qbs b/tests/auto/blackbox/testdata/artifacts-map-change-tracking/artifacts-map-change-tracking.qbs index 92579ad7c..2d9c95e95 100644 --- a/tests/auto/blackbox/testdata/artifacts-map-change-tracking/artifacts-map-change-tracking.qbs +++ b/tests/auto/blackbox/testdata/artifacts-map-change-tracking/artifacts-map-change-tracking.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.File Project { diff --git a/tests/auto/blackbox/testdata/artifacts-map-invalidation/artifacts-map-invalidation.qbs b/tests/auto/blackbox/testdata/artifacts-map-invalidation/artifacts-map-invalidation.qbs index 9d0c81d26..cd4e9b790 100644 --- a/tests/auto/blackbox/testdata/artifacts-map-invalidation/artifacts-map-invalidation.qbs +++ b/tests/auto/blackbox/testdata/artifacts-map-invalidation/artifacts-map-invalidation.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.File Project { diff --git a/tests/auto/blackbox/testdata/artifacts-map-race-condition/artifacts-map-race-condition.qbs b/tests/auto/blackbox/testdata/artifacts-map-race-condition/artifacts-map-race-condition.qbs index af568ae45..86255c6c3 100644 --- a/tests/auto/blackbox/testdata/artifacts-map-race-condition/artifacts-map-race-condition.qbs +++ b/tests/auto/blackbox/testdata/artifacts-map-race-condition/artifacts-map-race-condition.qbs @@ -1,5 +1,3 @@ -import qbs - Product { name: "p" type: ["custom1", "custom2", "custom3", "custom4", "custom5"] diff --git a/tests/auto/blackbox/testdata/assembly/assembly.qbs b/tests/auto/blackbox/testdata/assembly/assembly.qbs index 7dd82731a..f7bd4ecad 100644 --- a/tests/auto/blackbox/testdata/assembly/assembly.qbs +++ b/tests/auto/blackbox/testdata/assembly/assembly.qbs @@ -1,4 +1,3 @@ -import qbs 1.0 import qbs.TextFile Project { diff --git a/tests/auto/blackbox/testdata/autotest-with-dependencies/autotest-with-dependencies.qbs b/tests/auto/blackbox/testdata/autotest-with-dependencies/autotest-with-dependencies.qbs index 682b4c029..92d5ec6dd 100644 --- a/tests/auto/blackbox/testdata/autotest-with-dependencies/autotest-with-dependencies.qbs +++ b/tests/auto/blackbox/testdata/autotest-with-dependencies/autotest-with-dependencies.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.FileInfo Project { diff --git a/tests/auto/blackbox/testdata/autotests/autotests.qbs b/tests/auto/blackbox/testdata/autotests/autotests.qbs index b08bc425c..a2c2646dc 100644 --- a/tests/auto/blackbox/testdata/autotests/autotests.qbs +++ b/tests/auto/blackbox/testdata/autotests/autotests.qbs @@ -1,5 +1,3 @@ -import qbs - Project { references: ["test1", "test2", "test3"] AutotestRunner {} diff --git a/tests/auto/blackbox/testdata/autotests/test1/test1.qbs b/tests/auto/blackbox/testdata/autotests/test1/test1.qbs index 78326994d..8b078a759 100644 --- a/tests/auto/blackbox/testdata/autotests/test1/test1.qbs +++ b/tests/auto/blackbox/testdata/autotests/test1/test1.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { name: "test1" type: base.concat("autotest") diff --git a/tests/auto/blackbox/testdata/autotests/test2/test2.qbs b/tests/auto/blackbox/testdata/autotests/test2/test2.qbs index 0f110e1e7..2ce6ea5fa 100644 --- a/tests/auto/blackbox/testdata/autotests/test2/test2.qbs +++ b/tests/auto/blackbox/testdata/autotests/test2/test2.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { name: "test2" type: base.concat("autotest") diff --git a/tests/auto/blackbox/testdata/autotests/test3/test3.qbs b/tests/auto/blackbox/testdata/autotests/test3/test3.qbs index 3c7b734e3..34550dee7 100644 --- a/tests/auto/blackbox/testdata/autotests/test3/test3.qbs +++ b/tests/auto/blackbox/testdata/autotests/test3/test3.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { name: "test3" type: base.concat("autotest") diff --git a/tests/auto/blackbox/testdata/aux-inputs-from-deps/aux-inputs-from-deps.qbs b/tests/auto/blackbox/testdata/aux-inputs-from-deps/aux-inputs-from-deps.qbs index 620ae2ea0..6a9e9823d 100644 --- a/tests/auto/blackbox/testdata/aux-inputs-from-deps/aux-inputs-from-deps.qbs +++ b/tests/auto/blackbox/testdata/aux-inputs-from-deps/aux-inputs-from-deps.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.File import qbs.TextFile diff --git a/tests/auto/blackbox/testdata/badInterpreter/badInterpreter.qbs b/tests/auto/blackbox/testdata/badInterpreter/badInterpreter.qbs index a45391478..bef82a003 100644 --- a/tests/auto/blackbox/testdata/badInterpreter/badInterpreter.qbs +++ b/tests/auto/blackbox/testdata/badInterpreter/badInterpreter.qbs @@ -1,5 +1,3 @@ -import qbs - Project { qbsSearchPaths: base.concat(["qbs"]) diff --git a/tests/auto/blackbox/testdata/badInterpreter/qbs/modules/script-test/script-test.qbs b/tests/auto/blackbox/testdata/badInterpreter/qbs/modules/script-test/script-test.qbs index 79c008cf6..4d043ee59 100644 --- a/tests/auto/blackbox/testdata/badInterpreter/qbs/modules/script-test/script-test.qbs +++ b/tests/auto/blackbox/testdata/badInterpreter/qbs/modules/script-test/script-test.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.FileInfo import qbs.TextFile diff --git a/tests/auto/blackbox/testdata/bom-sources/bom-sources.qbs b/tests/auto/blackbox/testdata/bom-sources/bom-sources.qbs index 8b5dbb238..4446355bc 100644 --- a/tests/auto/blackbox/testdata/bom-sources/bom-sources.qbs +++ b/tests/auto/blackbox/testdata/bom-sources/bom-sources.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { name: "app" files: ["main.cpp", "theheader.h"] diff --git a/tests/auto/blackbox/testdata/build-data-of-disabled-product/build-data-of-disabled-product.qbs b/tests/auto/blackbox/testdata/build-data-of-disabled-product/build-data-of-disabled-product.qbs index 7e9d4779b..d71facf15 100644 --- a/tests/auto/blackbox/testdata/build-data-of-disabled-product/build-data-of-disabled-product.qbs +++ b/tests/auto/blackbox/testdata/build-data-of-disabled-product/build-data-of-disabled-product.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { name: "app" files: ["main.cpp", "test.cpp"] diff --git a/tests/auto/blackbox/testdata/build-directories/build-directories.qbs b/tests/auto/blackbox/testdata/build-directories/build-directories.qbs index 60a4e76dd..be7672ecf 100644 --- a/tests/auto/blackbox/testdata/build-directories/build-directories.qbs +++ b/tests/auto/blackbox/testdata/build-directories/build-directories.qbs @@ -1,5 +1,3 @@ -import qbs - Project { Product { name: "p1" diff --git a/tests/auto/blackbox/testdata/build-graph-versions/build-graph-versions.qbs b/tests/auto/blackbox/testdata/build-graph-versions/build-graph-versions.qbs index f6ae698a0..da7536315 100644 --- a/tests/auto/blackbox/testdata/build-graph-versions/build-graph-versions.qbs +++ b/tests/auto/blackbox/testdata/build-graph-versions/build-graph-versions.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { files: ["main.cpp"] } diff --git a/tests/auto/blackbox/testdata/buildenv-change/buildenv-change.qbs b/tests/auto/blackbox/testdata/buildenv-change/buildenv-change.qbs index c2445eafd..6c0bcc73e 100644 --- a/tests/auto/blackbox/testdata/buildenv-change/buildenv-change.qbs +++ b/tests/auto/blackbox/testdata/buildenv-change/buildenv-change.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { Probe { id: dummy diff --git a/tests/auto/blackbox/testdata/change-in-disabled-product/change-in-disabled-product.qbs b/tests/auto/blackbox/testdata/change-in-disabled-product/change-in-disabled-product.qbs index 8a99d2c8c..2f0dfc08c 100644 --- a/tests/auto/blackbox/testdata/change-in-disabled-product/change-in-disabled-product.qbs +++ b/tests/auto/blackbox/testdata/change-in-disabled-product/change-in-disabled-product.qbs @@ -1,5 +1,3 @@ -import qbs - Product { condition: false files: [ diff --git a/tests/auto/blackbox/testdata/change-in-imported-file/change-in-imported-file.qbs b/tests/auto/blackbox/testdata/change-in-imported-file/change-in-imported-file.qbs index cb8bf0668..cf5354268 100644 --- a/tests/auto/blackbox/testdata/change-in-imported-file/change-in-imported-file.qbs +++ b/tests/auto/blackbox/testdata/change-in-imported-file/change-in-imported-file.qbs @@ -1,4 +1,3 @@ -import qbs import "prepare.js" as PrepareHelper Product { diff --git a/tests/auto/blackbox/testdata/change-tracking-and-multiplexing/change-tracking-and-multiplexing.qbs b/tests/auto/blackbox/testdata/change-tracking-and-multiplexing/change-tracking-and-multiplexing.qbs index 78bd8abda..d1215355c 100644 --- a/tests/auto/blackbox/testdata/change-tracking-and-multiplexing/change-tracking-and-multiplexing.qbs +++ b/tests/auto/blackbox/testdata/change-tracking-and-multiplexing/change-tracking-and-multiplexing.qbs @@ -1,5 +1,3 @@ -import qbs - StaticLibrary { name: "l" diff --git a/tests/auto/blackbox/testdata/changed-files/changed-files.qbs b/tests/auto/blackbox/testdata/changed-files/changed-files.qbs index dd222479f..e5790d2e9 100644 --- a/tests/auto/blackbox/testdata/changed-files/changed-files.qbs +++ b/tests/auto/blackbox/testdata/changed-files/changed-files.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.TextFile CppApplication { diff --git a/tests/auto/blackbox/testdata/changed-rule-inputs/changed-rule-inputs.qbs b/tests/auto/blackbox/testdata/changed-rule-inputs/changed-rule-inputs.qbs index 8aef7b9b6..d11613c44 100644 --- a/tests/auto/blackbox/testdata/changed-rule-inputs/changed-rule-inputs.qbs +++ b/tests/auto/blackbox/testdata/changed-rule-inputs/changed-rule-inputs.qbs @@ -1,5 +1,3 @@ -import qbs - Project { Product { name: "p1" diff --git a/tests/auto/blackbox/testdata/check-timestamps/check-timestamps.qbs b/tests/auto/blackbox/testdata/check-timestamps/check-timestamps.qbs index 32456444c..65c29ca7a 100644 --- a/tests/auto/blackbox/testdata/check-timestamps/check-timestamps.qbs +++ b/tests/auto/blackbox/testdata/check-timestamps/check-timestamps.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { name: "app" files: [ diff --git a/tests/auto/blackbox/testdata/choose-module-instance/choose-module-instance.qbs b/tests/auto/blackbox/testdata/choose-module-instance/choose-module-instance.qbs index 233e21746..5f4148624 100644 --- a/tests/auto/blackbox/testdata/choose-module-instance/choose-module-instance.qbs +++ b/tests/auto/blackbox/testdata/choose-module-instance/choose-module-instance.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.FileInfo Project { diff --git a/tests/auto/blackbox/testdata/clean/clean.qbs b/tests/auto/blackbox/testdata/clean/clean.qbs index 28ebe91f0..ce3a8eb12 100644 --- a/tests/auto/blackbox/testdata/clean/clean.qbs +++ b/tests/auto/blackbox/testdata/clean/clean.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { DynamicLibrary { Depends { name: "cpp" } diff --git a/tests/auto/blackbox/testdata/cli/dotnettest.qbs b/tests/auto/blackbox/testdata/cli/dotnettest.qbs index c65a54c8c..9a10b8068 100644 --- a/tests/auto/blackbox/testdata/cli/dotnettest.qbs +++ b/tests/auto/blackbox/testdata/cli/dotnettest.qbs @@ -1,5 +1,3 @@ -import qbs - Project { Application { Depends { name: "cli" } diff --git a/tests/auto/blackbox/testdata/cli/fshello.qbs b/tests/auto/blackbox/testdata/cli/fshello.qbs index 44dbb5c4f..0d503d90f 100644 --- a/tests/auto/blackbox/testdata/cli/fshello.qbs +++ b/tests/auto/blackbox/testdata/cli/fshello.qbs @@ -1,5 +1,3 @@ -import qbs - Application { Depends { name: "cli" } type: "application" diff --git a/tests/auto/blackbox/testdata/combined-sources/combined-sources.qbs b/tests/auto/blackbox/testdata/combined-sources/combined-sources.qbs index c22b41c4f..277fc7c3a 100644 --- a/tests/auto/blackbox/testdata/combined-sources/combined-sources.qbs +++ b/tests/auto/blackbox/testdata/combined-sources/combined-sources.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { name: "theapp" files: [ diff --git a/tests/auto/blackbox/testdata/command-file/command-file.qbs b/tests/auto/blackbox/testdata/command-file/command-file.qbs index fb46a0712..8e25221c5 100644 --- a/tests/auto/blackbox/testdata/command-file/command-file.qbs +++ b/tests/auto/blackbox/testdata/command-file/command-file.qbs @@ -1,5 +1,3 @@ -import qbs - Project { StaticLibrary { name: "theLib" diff --git a/tests/auto/blackbox/testdata/compilerDefinesByLanguage/CppDefinesApp.qbs b/tests/auto/blackbox/testdata/compilerDefinesByLanguage/CppDefinesApp.qbs index da58f750a..b205ef2a7 100644 --- a/tests/auto/blackbox/testdata/compilerDefinesByLanguage/CppDefinesApp.qbs +++ b/tests/auto/blackbox/testdata/compilerDefinesByLanguage/CppDefinesApp.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { files: ["app.c"] diff --git a/tests/auto/blackbox/testdata/compilerDefinesByLanguage/compilerDefinesByLanguage.qbs b/tests/auto/blackbox/testdata/compilerDefinesByLanguage/compilerDefinesByLanguage.qbs index b4b126a50..001a87745 100644 --- a/tests/auto/blackbox/testdata/compilerDefinesByLanguage/compilerDefinesByLanguage.qbs +++ b/tests/auto/blackbox/testdata/compilerDefinesByLanguage/compilerDefinesByLanguage.qbs @@ -1,5 +1,3 @@ -import qbs - Project { CppDefinesApp { name: "A" diff --git a/tests/auto/blackbox/testdata/concurrent-executor/concurrent-executor.qbs b/tests/auto/blackbox/testdata/concurrent-executor/concurrent-executor.qbs index 99fec93f2..802aa1450 100644 --- a/tests/auto/blackbox/testdata/concurrent-executor/concurrent-executor.qbs +++ b/tests/auto/blackbox/testdata/concurrent-executor/concurrent-executor.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.File import qbs.TextFile import "util.js" as Utils diff --git a/tests/auto/blackbox/testdata/conditional-export/conditional-export.qbs b/tests/auto/blackbox/testdata/conditional-export/conditional-export.qbs index c7b6ae09d..0f2fb2f49 100644 --- a/tests/auto/blackbox/testdata/conditional-export/conditional-export.qbs +++ b/tests/auto/blackbox/testdata/conditional-export/conditional-export.qbs @@ -1,5 +1,3 @@ -import qbs - Project { property bool enableExport: false Product { diff --git a/tests/auto/blackbox/testdata/conditional-filetagger/conditional-filetagger.qbs b/tests/auto/blackbox/testdata/conditional-filetagger/conditional-filetagger.qbs index 286eb620a..5f0c93e46 100644 --- a/tests/auto/blackbox/testdata/conditional-filetagger/conditional-filetagger.qbs +++ b/tests/auto/blackbox/testdata/conditional-filetagger/conditional-filetagger.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { name: "theApp" property bool enableTagger diff --git a/tests/auto/blackbox/testdata/configure/configure.qbs b/tests/auto/blackbox/testdata/configure/configure.qbs index 1a3c02bb5..af5638dde 100644 --- a/tests/auto/blackbox/testdata/configure/configure.qbs +++ b/tests/auto/blackbox/testdata/configure/configure.qbs @@ -1,4 +1,3 @@ -import qbs 1.0 import qbs.FileInfo Project { diff --git a/tests/auto/blackbox/testdata/configure/modules/definition/module.qbs b/tests/auto/blackbox/testdata/configure/modules/definition/module.qbs index 56a5492e4..1d647faa2 100644 --- a/tests/auto/blackbox/testdata/configure/modules/definition/module.qbs +++ b/tests/auto/blackbox/testdata/configure/modules/definition/module.qbs @@ -1,4 +1,3 @@ -import qbs 1.0 import qbs.Process Module { diff --git a/tests/auto/blackbox/testdata/conflicting-artifacts/conflicting-artifacts.qbs b/tests/auto/blackbox/testdata/conflicting-artifacts/conflicting-artifacts.qbs index f2c5cb2bc..ade073e15 100644 --- a/tests/auto/blackbox/testdata/conflicting-artifacts/conflicting-artifacts.qbs +++ b/tests/auto/blackbox/testdata/conflicting-artifacts/conflicting-artifacts.qbs @@ -1,5 +1,3 @@ -import qbs - Project { CppApplication { name: "a" diff --git a/tests/auto/blackbox/testdata/cpu-features/cpu-features.qbs b/tests/auto/blackbox/testdata/cpu-features/cpu-features.qbs index 62f163a95..0bfdaceba 100644 --- a/tests/auto/blackbox/testdata/cpu-features/cpu-features.qbs +++ b/tests/auto/blackbox/testdata/cpu-features/cpu-features.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { Depends { name: "cpufeatures" } cpufeatures.x86_sse2: true diff --git a/tests/auto/blackbox/testdata/cxx-language-version/cxx-language-version.qbs b/tests/auto/blackbox/testdata/cxx-language-version/cxx-language-version.qbs index e0301eee1..6beaabfa3 100644 --- a/tests/auto/blackbox/testdata/cxx-language-version/cxx-language-version.qbs +++ b/tests/auto/blackbox/testdata/cxx-language-version/cxx-language-version.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { name: "app" diff --git a/tests/auto/blackbox/testdata/dependenciesProperty/dependenciesProperty.qbs b/tests/auto/blackbox/testdata/dependenciesProperty/dependenciesProperty.qbs index ea32bbb52..735bfffbc 100644 --- a/tests/auto/blackbox/testdata/dependenciesProperty/dependenciesProperty.qbs +++ b/tests/auto/blackbox/testdata/dependenciesProperty/dependenciesProperty.qbs @@ -1,4 +1,3 @@ -import qbs 1.0 import qbs.TextFile import qbs.FileInfo diff --git a/tests/auto/blackbox/testdata/dependency-profile-mismatch/dependency-profile-mismatch.qbs b/tests/auto/blackbox/testdata/dependency-profile-mismatch/dependency-profile-mismatch.qbs index ef2dee093..8a6f733c0 100644 --- a/tests/auto/blackbox/testdata/dependency-profile-mismatch/dependency-profile-mismatch.qbs +++ b/tests/auto/blackbox/testdata/dependency-profile-mismatch/dependency-profile-mismatch.qbs @@ -1,5 +1,3 @@ -import qbs - Project { property string mainProfile property string depProfile diff --git a/tests/auto/blackbox/testdata/disappeared-profile/disappeared-profile.qbs b/tests/auto/blackbox/testdata/disappeared-profile/disappeared-profile.qbs index 659864b14..f1460aea5 100644 --- a/tests/auto/blackbox/testdata/disappeared-profile/disappeared-profile.qbs +++ b/tests/auto/blackbox/testdata/disappeared-profile/disappeared-profile.qbs @@ -1,5 +1,3 @@ -import qbs - Product { type: ["out1", "out2"] Depends { name: "m" } diff --git a/tests/auto/blackbox/testdata/disappeared-profile/modules-dir/modules/m/m.qbs b/tests/auto/blackbox/testdata/disappeared-profile/modules-dir/modules/m/m.qbs index a9c898889..3e1747ade 100644 --- a/tests/auto/blackbox/testdata/disappeared-profile/modules-dir/modules/m/m.qbs +++ b/tests/auto/blackbox/testdata/disappeared-profile/modules-dir/modules/m/m.qbs @@ -1,5 +1,3 @@ -import qbs - Module { property string p1 property string p2 diff --git a/tests/auto/blackbox/testdata/discard-unused-data/discard-unused-data.qbs b/tests/auto/blackbox/testdata/discard-unused-data/discard-unused-data.qbs index b7cca4fa8..fdd3aa1f7 100644 --- a/tests/auto/blackbox/testdata/discard-unused-data/discard-unused-data.qbs +++ b/tests/auto/blackbox/testdata/discard-unused-data/discard-unused-data.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { name: "app" type: base.concat("custom") diff --git a/tests/auto/blackbox/testdata/driver-linker-flags/driver-linker-flags.qbs b/tests/auto/blackbox/testdata/driver-linker-flags/driver-linker-flags.qbs index 0802bc562..5de0fe053 100644 --- a/tests/auto/blackbox/testdata/driver-linker-flags/driver-linker-flags.qbs +++ b/tests/auto/blackbox/testdata/driver-linker-flags/driver-linker-flags.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { files: "main.cpp" diff --git a/tests/auto/blackbox/testdata/dynamic-library-in-module/Dll.qbs b/tests/auto/blackbox/testdata/dynamic-library-in-module/Dll.qbs index 565402a31..b3d901389 100644 --- a/tests/auto/blackbox/testdata/dynamic-library-in-module/Dll.qbs +++ b/tests/auto/blackbox/testdata/dynamic-library-in-module/Dll.qbs @@ -1,5 +1,3 @@ -import qbs - DynamicLibrary { Depends { name: "cpp" } Depends { name: "bundle"; condition: qbs.targetOS.contains("darwin") } diff --git a/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/thelib/thelib.qbs b/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/thelib/thelib.qbs index 41a6436d0..148902eda 100644 --- a/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/thelib/thelib.qbs +++ b/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/thelib/thelib.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.FileInfo Module { diff --git a/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/theotherlib/theotherlib.qbs b/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/theotherlib/theotherlib.qbs index 2a9a7314f..52d19c13c 100644 --- a/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/theotherlib/theotherlib.qbs +++ b/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/theotherlib/theotherlib.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.FileInfo Module { diff --git a/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/thethirdlib/thethirdlib.qbs b/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/thethirdlib/thethirdlib.qbs index d422d3f2c..b4592f514 100644 --- a/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/thethirdlib/thethirdlib.qbs +++ b/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/thethirdlib/thethirdlib.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.FileInfo Module { diff --git a/tests/auto/blackbox/testdata/dynamic-library-in-module/theapp.qbs b/tests/auto/blackbox/testdata/dynamic-library-in-module/theapp.qbs index 6bd0de9ab..0be9a2fd4 100644 --- a/tests/auto/blackbox/testdata/dynamic-library-in-module/theapp.qbs +++ b/tests/auto/blackbox/testdata/dynamic-library-in-module/theapp.qbs @@ -1,5 +1,3 @@ -import qbs - Project { CppApplication { name: "theapp" diff --git a/tests/auto/blackbox/testdata/dynamic-library-in-module/thelibs.qbs b/tests/auto/blackbox/testdata/dynamic-library-in-module/thelibs.qbs index 361642cca..b06a3f171 100644 --- a/tests/auto/blackbox/testdata/dynamic-library-in-module/thelibs.qbs +++ b/tests/auto/blackbox/testdata/dynamic-library-in-module/thelibs.qbs @@ -1,5 +1,3 @@ -import qbs - Project { Dll { name: "thelib" diff --git a/tests/auto/blackbox/testdata/dynamic-project/dynamic-project.qbs b/tests/auto/blackbox/testdata/dynamic-project/dynamic-project.qbs index eb7c56738..166648c80 100644 --- a/tests/auto/blackbox/testdata/dynamic-project/dynamic-project.qbs +++ b/tests/auto/blackbox/testdata/dynamic-project/dynamic-project.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.File import qbs.FileInfo import qbs.TextFile diff --git a/tests/auto/blackbox/testdata/dynamicMultiplexRule/dynamicMultiplexRule.qbs b/tests/auto/blackbox/testdata/dynamicMultiplexRule/dynamicMultiplexRule.qbs index d5315ac45..b8adcaf4b 100644 --- a/tests/auto/blackbox/testdata/dynamicMultiplexRule/dynamicMultiplexRule.qbs +++ b/tests/auto/blackbox/testdata/dynamicMultiplexRule/dynamicMultiplexRule.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.TextFile Project { diff --git a/tests/auto/blackbox/testdata/dynamicRuleOutputs/before/genlexer.qbs b/tests/auto/blackbox/testdata/dynamicRuleOutputs/before/genlexer.qbs index 04820e18f..5b50b5000 100644 --- a/tests/auto/blackbox/testdata/dynamicRuleOutputs/before/genlexer.qbs +++ b/tests/auto/blackbox/testdata/dynamicRuleOutputs/before/genlexer.qbs @@ -35,7 +35,6 @@ ** ****************************************************************************/ -import qbs 1.0 import qbs.FileInfo import qbs.Probes import qbs.TextFile diff --git a/tests/auto/blackbox/testdata/enableExceptions/exceptions-objc.qbs b/tests/auto/blackbox/testdata/enableExceptions/exceptions-objc.qbs index 74738ad12..eef00da78 100644 --- a/tests/auto/blackbox/testdata/enableExceptions/exceptions-objc.qbs +++ b/tests/auto/blackbox/testdata/enableExceptions/exceptions-objc.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { files: ["main.m"] cpp.frameworks: ["Foundation"] diff --git a/tests/auto/blackbox/testdata/enableExceptions/exceptions-objcpp-cpp.qbs b/tests/auto/blackbox/testdata/enableExceptions/exceptions-objcpp-cpp.qbs index b6db6879b..7f703b9ad 100644 --- a/tests/auto/blackbox/testdata/enableExceptions/exceptions-objcpp-cpp.qbs +++ b/tests/auto/blackbox/testdata/enableExceptions/exceptions-objcpp-cpp.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { Group { files: ["main.cpp"] diff --git a/tests/auto/blackbox/testdata/enableExceptions/exceptions-objcpp.qbs b/tests/auto/blackbox/testdata/enableExceptions/exceptions-objcpp.qbs index 8efb5d585..8946f9a38 100644 --- a/tests/auto/blackbox/testdata/enableExceptions/exceptions-objcpp.qbs +++ b/tests/auto/blackbox/testdata/enableExceptions/exceptions-objcpp.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { Group { files: ["main.m"] diff --git a/tests/auto/blackbox/testdata/enableExceptions/exceptions.qbs b/tests/auto/blackbox/testdata/enableExceptions/exceptions.qbs index da6fdbc2d..9a75043a8 100644 --- a/tests/auto/blackbox/testdata/enableExceptions/exceptions.qbs +++ b/tests/auto/blackbox/testdata/enableExceptions/exceptions.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { files: ["main.cpp"] cpp.treatWarningsAsErrors: true diff --git a/tests/auto/blackbox/testdata/enableExceptions/none.qbs b/tests/auto/blackbox/testdata/enableExceptions/none.qbs index 332af7614..8fb052476 100644 --- a/tests/auto/blackbox/testdata/enableExceptions/none.qbs +++ b/tests/auto/blackbox/testdata/enableExceptions/none.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { files: ["emptymain.cpp"] diff --git a/tests/auto/blackbox/testdata/enableRtti/rtti.qbs b/tests/auto/blackbox/testdata/enableRtti/rtti.qbs index f032bb16b..85bfa9c1d 100644 --- a/tests/auto/blackbox/testdata/enableRtti/rtti.qbs +++ b/tests/auto/blackbox/testdata/enableRtti/rtti.qbs @@ -1,5 +1,3 @@ -import qbs - Project { property bool treatAsObjcpp: false CppApplication { diff --git a/tests/auto/blackbox/testdata/env-merging/env-merging.qbs b/tests/auto/blackbox/testdata/env-merging/env-merging.qbs index 884dc4745..6edeca444 100644 --- a/tests/auto/blackbox/testdata/env-merging/env-merging.qbs +++ b/tests/auto/blackbox/testdata/env-merging/env-merging.qbs @@ -1,5 +1,3 @@ -import qbs - Project { CppApplication { name: "tool" diff --git a/tests/auto/blackbox/testdata/env-normalization/env-normalization.qbs b/tests/auto/blackbox/testdata/env-normalization/env-normalization.qbs index a197208fb..3b242aeb0 100644 --- a/tests/auto/blackbox/testdata/env-normalization/env-normalization.qbs +++ b/tests/auto/blackbox/testdata/env-normalization/env-normalization.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Environment Product { diff --git a/tests/auto/blackbox/testdata/erroneous/nonexistentWorkingDir/nonexistentWorkingDir.qbs b/tests/auto/blackbox/testdata/erroneous/nonexistentWorkingDir/nonexistentWorkingDir.qbs index 8cf1bfaad..6a763e1ad 100644 --- a/tests/auto/blackbox/testdata/erroneous/nonexistentWorkingDir/nonexistentWorkingDir.qbs +++ b/tests/auto/blackbox/testdata/erroneous/nonexistentWorkingDir/nonexistentWorkingDir.qbs @@ -1,5 +1,3 @@ -import qbs - Application { name: "kaputt" type: ["nutritious"] diff --git a/tests/auto/blackbox/testdata/erroneous/outputArtifacts-missing-filePath/outputArtifacts-missing-filePath.qbs b/tests/auto/blackbox/testdata/erroneous/outputArtifacts-missing-filePath/outputArtifacts-missing-filePath.qbs index 7a6c3a25d..047ddb862 100644 --- a/tests/auto/blackbox/testdata/erroneous/outputArtifacts-missing-filePath/outputArtifacts-missing-filePath.qbs +++ b/tests/auto/blackbox/testdata/erroneous/outputArtifacts-missing-filePath/outputArtifacts-missing-filePath.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - CppApplication { type: base.concat("txt") files : ["main.cpp"] diff --git a/tests/auto/blackbox/testdata/erroneous/outputArtifacts-missing-fileTags/outputArtifacts-missing-fileTags.qbs b/tests/auto/blackbox/testdata/erroneous/outputArtifacts-missing-fileTags/outputArtifacts-missing-fileTags.qbs index 9b71cf73a..8b7b9482e 100644 --- a/tests/auto/blackbox/testdata/erroneous/outputArtifacts-missing-fileTags/outputArtifacts-missing-fileTags.qbs +++ b/tests/auto/blackbox/testdata/erroneous/outputArtifacts-missing-fileTags/outputArtifacts-missing-fileTags.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - CppApplication { type: base.concat("txt") files : ["main.cpp"] diff --git a/tests/auto/blackbox/testdata/erroneous/texttemplate-unknown-placeholder/texttemplate-unknown-placeholder.qbs b/tests/auto/blackbox/testdata/erroneous/texttemplate-unknown-placeholder/texttemplate-unknown-placeholder.qbs index 3ad31a609..01963292a 100644 --- a/tests/auto/blackbox/testdata/erroneous/texttemplate-unknown-placeholder/texttemplate-unknown-placeholder.qbs +++ b/tests/auto/blackbox/testdata/erroneous/texttemplate-unknown-placeholder/texttemplate-unknown-placeholder.qbs @@ -1,5 +1,3 @@ -import qbs - Product { type: ["text"] Depends { name: "texttemplate" } diff --git a/tests/auto/blackbox/testdata/error-info/error-info.qbs b/tests/auto/blackbox/testdata/error-info/error-info.qbs index afd44c246..b8f42b4b2 100644 --- a/tests/auto/blackbox/testdata/error-info/error-info.qbs +++ b/tests/auto/blackbox/testdata/error-info/error-info.qbs @@ -1,4 +1,3 @@ -import qbs import "helper.js" as Helper Project { diff --git a/tests/auto/blackbox/testdata/escaped-linker-flags/escaped-linker-flags.qbs b/tests/auto/blackbox/testdata/escaped-linker-flags/escaped-linker-flags.qbs index e136acb30..f48bf8d1f 100644 --- a/tests/auto/blackbox/testdata/escaped-linker-flags/escaped-linker-flags.qbs +++ b/tests/auto/blackbox/testdata/escaped-linker-flags/escaped-linker-flags.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { name: "app" property bool escapeLinkerFlags diff --git a/tests/auto/blackbox/testdata/explicitly-depends-on/explicitly-depends-on.qbs b/tests/auto/blackbox/testdata/explicitly-depends-on/explicitly-depends-on.qbs index 10cfa089b..4f190c23d 100644 --- a/tests/auto/blackbox/testdata/explicitly-depends-on/explicitly-depends-on.qbs +++ b/tests/auto/blackbox/testdata/explicitly-depends-on/explicitly-depends-on.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.File import qbs.TextFile diff --git a/tests/auto/blackbox/testdata/explicitly-depends-on/modules/module1/module1.qbs b/tests/auto/blackbox/testdata/explicitly-depends-on/modules/module1/module1.qbs index f1752b4ed..b710c4e21 100644 --- a/tests/auto/blackbox/testdata/explicitly-depends-on/modules/module1/module1.qbs +++ b/tests/auto/blackbox/testdata/explicitly-depends-on/modules/module1/module1.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Group { filesAreTargets: true diff --git a/tests/auto/blackbox/testdata/export-rule/export-rule.qbs b/tests/auto/blackbox/testdata/export-rule/export-rule.qbs index 0b1f9f99b..29899e728 100644 --- a/tests/auto/blackbox/testdata/export-rule/export-rule.qbs +++ b/tests/auto/blackbox/testdata/export-rule/export-rule.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.File Project { diff --git a/tests/auto/blackbox/testdata/export-to-outside-searchpath/export-to-outside-searchpath.qbs b/tests/auto/blackbox/testdata/export-to-outside-searchpath/export-to-outside-searchpath.qbs index 72c48b75a..42e17486f 100644 --- a/tests/auto/blackbox/testdata/export-to-outside-searchpath/export-to-outside-searchpath.qbs +++ b/tests/auto/blackbox/testdata/export-to-outside-searchpath/export-to-outside-searchpath.qbs @@ -1,5 +1,3 @@ -import qbs - Project { Project { qbsSearchPaths: ["qbs-resources"] diff --git a/tests/auto/blackbox/testdata/export-to-outside-searchpath/qbs-resources/modules/aModule/aModule.qbs b/tests/auto/blackbox/testdata/export-to-outside-searchpath/qbs-resources/modules/aModule/aModule.qbs index 3e67ba10d..84957060c 100644 --- a/tests/auto/blackbox/testdata/export-to-outside-searchpath/qbs-resources/modules/aModule/aModule.qbs +++ b/tests/auto/blackbox/testdata/export-to-outside-searchpath/qbs-resources/modules/aModule/aModule.qbs @@ -1,4 +1,2 @@ -import qbs - Module { } diff --git a/tests/auto/blackbox/testdata/exported-dependency-in-disabled-product/exported-dependency-in-disabled-product.qbs b/tests/auto/blackbox/testdata/exported-dependency-in-disabled-product/exported-dependency-in-disabled-product.qbs index 9904502a6..ac6022b9d 100644 --- a/tests/auto/blackbox/testdata/exported-dependency-in-disabled-product/exported-dependency-in-disabled-product.qbs +++ b/tests/auto/blackbox/testdata/exported-dependency-in-disabled-product/exported-dependency-in-disabled-product.qbs @@ -1,5 +1,3 @@ -import qbs - Project { Application { name: "app" diff --git a/tests/auto/blackbox/testdata/exported-dependency-in-disabled-product/modules/broken/broken.qbs b/tests/auto/blackbox/testdata/exported-dependency-in-disabled-product/modules/broken/broken.qbs index 92f01d5d3..328e5f558 100644 --- a/tests/auto/blackbox/testdata/exported-dependency-in-disabled-product/modules/broken/broken.qbs +++ b/tests/auto/blackbox/testdata/exported-dependency-in-disabled-product/modules/broken/broken.qbs @@ -1,5 +1,3 @@ -import qbs - Module { validate: { throw "broken!"; } } diff --git a/tests/auto/blackbox/testdata/exported-property-in-disabled-product/exported-property-in-disabled-product.qbs b/tests/auto/blackbox/testdata/exported-property-in-disabled-product/exported-property-in-disabled-product.qbs index 2717466b0..ff8beb347 100644 --- a/tests/auto/blackbox/testdata/exported-property-in-disabled-product/exported-property-in-disabled-product.qbs +++ b/tests/auto/blackbox/testdata/exported-property-in-disabled-product/exported-property-in-disabled-product.qbs @@ -1,5 +1,3 @@ -import qbs - Project { CppApplication { name: "app" diff --git a/tests/auto/blackbox/testdata/exported-property-in-disabled-product/modules/broken/broken.qbs b/tests/auto/blackbox/testdata/exported-property-in-disabled-product/modules/broken/broken.qbs index 92f01d5d3..328e5f558 100644 --- a/tests/auto/blackbox/testdata/exported-property-in-disabled-product/modules/broken/broken.qbs +++ b/tests/auto/blackbox/testdata/exported-property-in-disabled-product/modules/broken/broken.qbs @@ -1,5 +1,3 @@ -import qbs - Module { validate: { throw "broken!"; } } diff --git a/tests/auto/blackbox/testdata/exports-pkgconfig/exports-pkgconfig.qbs b/tests/auto/blackbox/testdata/exports-pkgconfig/exports-pkgconfig.qbs index 674f78c94..48de6d48a 100644 --- a/tests/auto/blackbox/testdata/exports-pkgconfig/exports-pkgconfig.qbs +++ b/tests/auto/blackbox/testdata/exports-pkgconfig/exports-pkgconfig.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.FileInfo Project { diff --git a/tests/auto/blackbox/testdata/exports-pkgconfig/modules/helper1/helper1.qbs b/tests/auto/blackbox/testdata/exports-pkgconfig/modules/helper1/helper1.qbs index b753ec295..c898e91d1 100644 --- a/tests/auto/blackbox/testdata/exports-pkgconfig/modules/helper1/helper1.qbs +++ b/tests/auto/blackbox/testdata/exports-pkgconfig/modules/helper1/helper1.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Depends { name: "cpp" } Depends { name: "helper2" } diff --git a/tests/auto/blackbox/testdata/exports-pkgconfig/modules/helper2/helper2.qbs b/tests/auto/blackbox/testdata/exports-pkgconfig/modules/helper2/helper2.qbs index 9d24a812d..2dbdfdb01 100644 --- a/tests/auto/blackbox/testdata/exports-pkgconfig/modules/helper2/helper2.qbs +++ b/tests/auto/blackbox/testdata/exports-pkgconfig/modules/helper2/helper2.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Depends { name: "cpp" } cpp.includePaths: "/somedir/include2" diff --git a/tests/auto/blackbox/testdata/exports-pkgconfig/modules/helper3/helper3.qbs b/tests/auto/blackbox/testdata/exports-pkgconfig/modules/helper3/helper3.qbs index 452191994..57e65f2f9 100644 --- a/tests/auto/blackbox/testdata/exports-pkgconfig/modules/helper3/helper3.qbs +++ b/tests/auto/blackbox/testdata/exports-pkgconfig/modules/helper3/helper3.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Depends { name: "cpp" } cpp.includePaths: "/somedir/include3" diff --git a/tests/auto/blackbox/testdata/exports-qbs/consumer.qbs b/tests/auto/blackbox/testdata/exports-qbs/consumer.qbs index 252cb8291..02affdfe8 100644 --- a/tests/auto/blackbox/testdata/exports-qbs/consumer.qbs +++ b/tests/auto/blackbox/testdata/exports-qbs/consumer.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { name: "consumer" qbsSearchPaths: "default/install-root/usr/qbs" diff --git a/tests/auto/blackbox/testdata/exports-qbs/exports-qbs.qbs b/tests/auto/blackbox/testdata/exports-qbs/exports-qbs.qbs index 2bad55aaa..27e417ef9 100644 --- a/tests/auto/blackbox/testdata/exports-qbs/exports-qbs.qbs +++ b/tests/auto/blackbox/testdata/exports-qbs/exports-qbs.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.FileInfo Project { diff --git a/tests/auto/blackbox/testdata/exports-qbs/lib.qbs b/tests/auto/blackbox/testdata/exports-qbs/lib.qbs index 54f524c23..53a472dbb 100644 --- a/tests/auto/blackbox/testdata/exports-qbs/lib.qbs +++ b/tests/auto/blackbox/testdata/exports-qbs/lib.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.FileInfo DynamicLibrary { diff --git a/tests/auto/blackbox/testdata/exports-qbs/tool.qbs b/tests/auto/blackbox/testdata/exports-qbs/tool.qbs index 01521405f..655597cf7 100644 --- a/tests/auto/blackbox/testdata/exports-qbs/tool.qbs +++ b/tests/auto/blackbox/testdata/exports-qbs/tool.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.FileInfo import "helper.js" as Helper diff --git a/tests/auto/blackbox/testdata/external-libs/external-libs.qbs b/tests/auto/blackbox/testdata/external-libs/external-libs.qbs index d2e983c3e..619f40867 100644 --- a/tests/auto/blackbox/testdata/external-libs/external-libs.qbs +++ b/tests/auto/blackbox/testdata/external-libs/external-libs.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.TextFile Project { diff --git a/tests/auto/blackbox/testdata/fileDependencies/fileDependencies.qbs b/tests/auto/blackbox/testdata/fileDependencies/fileDependencies.qbs index e99e0932c..49f413807 100644 --- a/tests/auto/blackbox/testdata/fileDependencies/fileDependencies.qbs +++ b/tests/auto/blackbox/testdata/fileDependencies/fileDependencies.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { Product { type: "application" diff --git a/tests/auto/blackbox/testdata/filetagsfilter-merging/MyApplication.qbs b/tests/auto/blackbox/testdata/filetagsfilter-merging/MyApplication.qbs index 1bd215cc6..890fc51ce 100644 --- a/tests/auto/blackbox/testdata/filetagsfilter-merging/MyApplication.qbs +++ b/tests/auto/blackbox/testdata/filetagsfilter-merging/MyApplication.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { consoleApplication: true Group { diff --git a/tests/auto/blackbox/testdata/filetagsfilter-merging/filetagsfilter-merging.qbs b/tests/auto/blackbox/testdata/filetagsfilter-merging/filetagsfilter-merging.qbs index ae1342bff..eee20782e 100644 --- a/tests/auto/blackbox/testdata/filetagsfilter-merging/filetagsfilter-merging.qbs +++ b/tests/auto/blackbox/testdata/filetagsfilter-merging/filetagsfilter-merging.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.TextFile MyApplication { diff --git a/tests/auto/blackbox/testdata/find/find-cli.qbs b/tests/auto/blackbox/testdata/find/find-cli.qbs index 63609b3b2..20d94803e 100644 --- a/tests/auto/blackbox/testdata/find/find-cli.qbs +++ b/tests/auto/blackbox/testdata/find/find-cli.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.TextFile Product { diff --git a/tests/auto/blackbox/testdata/generated-artifact-as-input-to-dynamic-rule/p.qbs b/tests/auto/blackbox/testdata/generated-artifact-as-input-to-dynamic-rule/p.qbs index f26d92262..f3c10138a 100644 --- a/tests/auto/blackbox/testdata/generated-artifact-as-input-to-dynamic-rule/p.qbs +++ b/tests/auto/blackbox/testdata/generated-artifact-as-input-to-dynamic-rule/p.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.File import qbs.TextFile diff --git a/tests/auto/blackbox/testdata/generator/generator.qbs b/tests/auto/blackbox/testdata/generator/generator.qbs index 18f2caaea..d0857beb5 100644 --- a/tests/auto/blackbox/testdata/generator/generator.qbs +++ b/tests/auto/blackbox/testdata/generator/generator.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.TextFile CppApplication { diff --git a/tests/auto/blackbox/testdata/group-condition-change/group-condition-change.qbs b/tests/auto/blackbox/testdata/group-condition-change/group-condition-change.qbs index d8dccde39..ae1811375 100644 --- a/tests/auto/blackbox/testdata/group-condition-change/group-condition-change.qbs +++ b/tests/auto/blackbox/testdata/group-condition-change/group-condition-change.qbs @@ -1,5 +1,3 @@ -import qbs - Project { property bool kaputt: true Product { diff --git a/tests/auto/blackbox/testdata/groups-in-modules/groups-in-modules.qbs b/tests/auto/blackbox/testdata/groups-in-modules/groups-in-modules.qbs index 5fa09c4d0..7347b1211 100644 --- a/tests/auto/blackbox/testdata/groups-in-modules/groups-in-modules.qbs +++ b/tests/auto/blackbox/testdata/groups-in-modules/groups-in-modules.qbs @@ -1,5 +1,3 @@ -import qbs - Project { Product { Depends { name: "dep" } diff --git a/tests/auto/blackbox/testdata/groups-in-modules/modules/helper/helper.qbs b/tests/auto/blackbox/testdata/groups-in-modules/modules/helper/helper.qbs index 3154986a6..cbd30a35d 100644 --- a/tests/auto/blackbox/testdata/groups-in-modules/modules/helper/helper.qbs +++ b/tests/auto/blackbox/testdata/groups-in-modules/modules/helper/helper.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.FileInfo Module { diff --git a/tests/auto/blackbox/testdata/groups-in-modules/modules/helper2/helper2.qbs b/tests/auto/blackbox/testdata/groups-in-modules/modules/helper2/helper2.qbs index fbf15f6da..18d11c8f5 100644 --- a/tests/auto/blackbox/testdata/groups-in-modules/modules/helper2/helper2.qbs +++ b/tests/auto/blackbox/testdata/groups-in-modules/modules/helper2/helper2.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Depends { name: "cpp" } diff --git a/tests/auto/blackbox/testdata/groups-in-modules/modules/helper3/helper3.qbs b/tests/auto/blackbox/testdata/groups-in-modules/modules/helper3/helper3.qbs index 00c619a38..de3e6171c 100644 --- a/tests/auto/blackbox/testdata/groups-in-modules/modules/helper3/helper3.qbs +++ b/tests/auto/blackbox/testdata/groups-in-modules/modules/helper3/helper3.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Depends { name: "cpp" } diff --git a/tests/auto/blackbox/testdata/groups-in-modules/modules/helper4/helper4.qbs b/tests/auto/blackbox/testdata/groups-in-modules/modules/helper4/helper4.qbs index e2d668209..18dce4dc5 100644 --- a/tests/auto/blackbox/testdata/groups-in-modules/modules/helper4/helper4.qbs +++ b/tests/auto/blackbox/testdata/groups-in-modules/modules/helper4/helper4.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Depends { name: "cpp" } Depends { name: "helper5" } diff --git a/tests/auto/blackbox/testdata/groups-in-modules/modules/helper5/helper5.qbs b/tests/auto/blackbox/testdata/groups-in-modules/modules/helper5/helper5.qbs index 3e4e8923e..58c8144d6 100644 --- a/tests/auto/blackbox/testdata/groups-in-modules/modules/helper5/helper5.qbs +++ b/tests/auto/blackbox/testdata/groups-in-modules/modules/helper5/helper5.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Depends { name: "cpp" } Depends { diff --git a/tests/auto/blackbox/testdata/groups-in-modules/modules/helper6/helper6.qbs b/tests/auto/blackbox/testdata/groups-in-modules/modules/helper6/helper6.qbs index 736572570..8f73567e6 100644 --- a/tests/auto/blackbox/testdata/groups-in-modules/modules/helper6/helper6.qbs +++ b/tests/auto/blackbox/testdata/groups-in-modules/modules/helper6/helper6.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Depends { name: "cpp" } diff --git a/tests/auto/blackbox/testdata/ico/ico.qbs b/tests/auto/blackbox/testdata/ico/ico.qbs index 920189b85..e9d635820 100644 --- a/tests/auto/blackbox/testdata/ico/ico.qbs +++ b/tests/auto/blackbox/testdata/ico/ico.qbs @@ -1,5 +1,3 @@ -import qbs - Project { Product { Depends { name: "ico" } diff --git a/tests/auto/blackbox/testdata/import-assignment/import-assignment.qbs b/tests/auto/blackbox/testdata/import-assignment/import-assignment.qbs index 2bff00f35..f5efbd14b 100644 --- a/tests/auto/blackbox/testdata/import-assignment/import-assignment.qbs +++ b/tests/auto/blackbox/testdata/import-assignment/import-assignment.qbs @@ -1,4 +1,3 @@ -import qbs import MyImport Product { diff --git a/tests/auto/blackbox/testdata/import-change-tracking/import-change-tracking-product.qbs b/tests/auto/blackbox/testdata/import-change-tracking/import-change-tracking-product.qbs index c229de889..c86a1bbb7 100644 --- a/tests/auto/blackbox/testdata/import-change-tracking/import-change-tracking-product.qbs +++ b/tests/auto/blackbox/testdata/import-change-tracking/import-change-tracking-product.qbs @@ -1,4 +1,3 @@ -import qbs import "irrelevant.js" as Irrelevant import "custom1prepare1.js" as Custom1Prepare import "custom2prepare" as Custom2Prepare diff --git a/tests/auto/blackbox/testdata/import-change-tracking/import-change-tracking.qbs b/tests/auto/blackbox/testdata/import-change-tracking/import-change-tracking.qbs index 009c0897f..c97e0c7f8 100644 --- a/tests/auto/blackbox/testdata/import-change-tracking/import-change-tracking.qbs +++ b/tests/auto/blackbox/testdata/import-change-tracking/import-change-tracking.qbs @@ -1,5 +1,3 @@ -import qbs - Project { qbsSearchPaths: ["."] references: "import-change-tracking-product.qbs" diff --git a/tests/auto/blackbox/testdata/import-in-properties-condition/import-in-properties-condition.qbs b/tests/auto/blackbox/testdata/import-in-properties-condition/import-in-properties-condition.qbs index 32b8d2a03..d4ed153af 100644 --- a/tests/auto/blackbox/testdata/import-in-properties-condition/import-in-properties-condition.qbs +++ b/tests/auto/blackbox/testdata/import-in-properties-condition/import-in-properties-condition.qbs @@ -1,5 +1,3 @@ -import qbs - Product { Depends { name: "amodule" } } diff --git a/tests/auto/blackbox/testdata/import-in-properties-condition/modules/amodule/m.qbs b/tests/auto/blackbox/testdata/import-in-properties-condition/modules/amodule/m.qbs index 92ea2cd45..3402b16de 100644 --- a/tests/auto/blackbox/testdata/import-in-properties-condition/modules/amodule/m.qbs +++ b/tests/auto/blackbox/testdata/import-in-properties-condition/modules/amodule/m.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.File Module { diff --git a/tests/auto/blackbox/testdata/import-in-properties-condition/modules/depmodule/m.qbs b/tests/auto/blackbox/testdata/import-in-properties-condition/modules/depmodule/m.qbs index 4c2f9281d..3a4266b78 100644 --- a/tests/auto/blackbox/testdata/import-in-properties-condition/modules/depmodule/m.qbs +++ b/tests/auto/blackbox/testdata/import-in-properties-condition/modules/depmodule/m.qbs @@ -1,5 +1,3 @@ -import qbs - Module { property string prop } diff --git a/tests/auto/blackbox/testdata/import-searchpath/import-searchpath.qbs b/tests/auto/blackbox/testdata/import-searchpath/import-searchpath.qbs index b4d0194a2..3dbb1f641 100644 --- a/tests/auto/blackbox/testdata/import-searchpath/import-searchpath.qbs +++ b/tests/auto/blackbox/testdata/import-searchpath/import-searchpath.qbs @@ -1,5 +1,3 @@ -import qbs - Project { Project { qbsSearchPaths: ["qbs"] diff --git a/tests/auto/blackbox/testdata/import-searchpath/qbs/imports/CppApplication.qbs b/tests/auto/blackbox/testdata/import-searchpath/qbs/imports/CppApplication.qbs index 18dc695f3..bdef20fd8 100644 --- a/tests/auto/blackbox/testdata/import-searchpath/qbs/imports/CppApplication.qbs +++ b/tests/auto/blackbox/testdata/import-searchpath/qbs/imports/CppApplication.qbs @@ -1,4 +1,2 @@ -import qbs - Product { } diff --git a/tests/auto/blackbox/testdata/import-searchpath/src/import-searchpath-app1.qbs b/tests/auto/blackbox/testdata/import-searchpath/src/import-searchpath-app1.qbs index c12158d24..a973a2722 100644 --- a/tests/auto/blackbox/testdata/import-searchpath/src/import-searchpath-app1.qbs +++ b/tests/auto/blackbox/testdata/import-searchpath/src/import-searchpath-app1.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { files: ["somefile.cpp"] } diff --git a/tests/auto/blackbox/testdata/import-searchpath/src/import-searchpath-app2.qbs b/tests/auto/blackbox/testdata/import-searchpath/src/import-searchpath-app2.qbs index f6ae698a0..da7536315 100644 --- a/tests/auto/blackbox/testdata/import-searchpath/src/import-searchpath-app2.qbs +++ b/tests/auto/blackbox/testdata/import-searchpath/src/import-searchpath-app2.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { files: ["main.cpp"] } diff --git a/tests/auto/blackbox/testdata/importing-product/importing-product.qbs b/tests/auto/blackbox/testdata/importing-product/importing-product.qbs index e81f76077..dfc4cd65e 100644 --- a/tests/auto/blackbox/testdata/importing-product/importing-product.qbs +++ b/tests/auto/blackbox/testdata/importing-product/importing-product.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.File Project { diff --git a/tests/auto/blackbox/testdata/imports-conflict/imports-conflict.qbs b/tests/auto/blackbox/testdata/imports-conflict/imports-conflict.qbs index 1c6be24bd..4966b2f09 100644 --- a/tests/auto/blackbox/testdata/imports-conflict/imports-conflict.qbs +++ b/tests/auto/blackbox/testdata/imports-conflict/imports-conflict.qbs @@ -1,5 +1,3 @@ -import qbs - Project { Product { name: "Utils" diff --git a/tests/auto/blackbox/testdata/includeLookup/includeLookup.qbs b/tests/auto/blackbox/testdata/includeLookup/includeLookup.qbs index 452e4b5bd..182d1e232 100644 --- a/tests/auto/blackbox/testdata/includeLookup/includeLookup.qbs +++ b/tests/auto/blackbox/testdata/includeLookup/includeLookup.qbs @@ -1,4 +1,3 @@ -import qbs 1.0 import qbs.FileInfo Project { diff --git a/tests/auto/blackbox/testdata/includeLookup/modules/definition/module.qbs b/tests/auto/blackbox/testdata/includeLookup/modules/definition/module.qbs index e894cfd49..c28fd1310 100644 --- a/tests/auto/blackbox/testdata/includeLookup/modules/definition/module.qbs +++ b/tests/auto/blackbox/testdata/includeLookup/modules/definition/module.qbs @@ -1,4 +1,3 @@ -import qbs 1.0 import qbs.Probes Module { diff --git a/tests/auto/blackbox/testdata/innosetup/innosetup.qbs b/tests/auto/blackbox/testdata/innosetup/innosetup.qbs index 679f1de8f..c9f6a22e8 100644 --- a/tests/auto/blackbox/testdata/innosetup/innosetup.qbs +++ b/tests/auto/blackbox/testdata/innosetup/innosetup.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.FileInfo Project { diff --git a/tests/auto/blackbox/testdata/innosetupDependencies/innosetupDependencies.qbs b/tests/auto/blackbox/testdata/innosetupDependencies/innosetupDependencies.qbs index 83aa5cf71..db65e127f 100644 --- a/tests/auto/blackbox/testdata/innosetupDependencies/innosetupDependencies.qbs +++ b/tests/auto/blackbox/testdata/innosetupDependencies/innosetupDependencies.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.TextFile Project { diff --git a/tests/auto/blackbox/testdata/inputs-from-dependencies/inputs-from-dependencies.qbs b/tests/auto/blackbox/testdata/inputs-from-dependencies/inputs-from-dependencies.qbs index 1b40abaeb..919060c73 100644 --- a/tests/auto/blackbox/testdata/inputs-from-dependencies/inputs-from-dependencies.qbs +++ b/tests/auto/blackbox/testdata/inputs-from-dependencies/inputs-from-dependencies.qbs @@ -1,5 +1,3 @@ -import qbs - Project { Product { name: "TextFileContainer1" diff --git a/tests/auto/blackbox/testdata/install-duplicates-no-error/install-duplicates-no-error.qbs b/tests/auto/blackbox/testdata/install-duplicates-no-error/install-duplicates-no-error.qbs index 3f2c4e974..a3282f941 100644 --- a/tests/auto/blackbox/testdata/install-duplicates-no-error/install-duplicates-no-error.qbs +++ b/tests/auto/blackbox/testdata/install-duplicates-no-error/install-duplicates-no-error.qbs @@ -1,5 +1,3 @@ -import qbs - Project { Product { name: "p1" diff --git a/tests/auto/blackbox/testdata/install-duplicates/install-duplicates.qbs b/tests/auto/blackbox/testdata/install-duplicates/install-duplicates.qbs index 2f91ba560..5edc83d81 100644 --- a/tests/auto/blackbox/testdata/install-duplicates/install-duplicates.qbs +++ b/tests/auto/blackbox/testdata/install-duplicates/install-duplicates.qbs @@ -1,5 +1,3 @@ -import qbs - Product { Group { files: ["*.txt"] diff --git a/tests/auto/blackbox/testdata/install-locations/install-locations.qbs b/tests/auto/blackbox/testdata/install-locations/install-locations.qbs index 44ddaabd8..0ae3d62e3 100644 --- a/tests/auto/blackbox/testdata/install-locations/install-locations.qbs +++ b/tests/auto/blackbox/testdata/install-locations/install-locations.qbs @@ -1,5 +1,3 @@ -import qbs - Project { property bool dummy: { if (qbs.targetOS.contains("windows")) diff --git a/tests/auto/blackbox/testdata/install-root-from-project-file/install-root-from-project-file.qbs b/tests/auto/blackbox/testdata/install-root-from-project-file/install-root-from-project-file.qbs index ea7284a05..80a63c956 100644 --- a/tests/auto/blackbox/testdata/install-root-from-project-file/install-root-from-project-file.qbs +++ b/tests/auto/blackbox/testdata/install-root-from-project-file/install-root-from-project-file.qbs @@ -1,5 +1,3 @@ -import qbs - Product { name: "p" property string installRoot diff --git a/tests/auto/blackbox/testdata/install-tree/install-tree.qbs b/tests/auto/blackbox/testdata/install-tree/install-tree.qbs index 69571d58a..dde39d231 100644 --- a/tests/auto/blackbox/testdata/install-tree/install-tree.qbs +++ b/tests/auto/blackbox/testdata/install-tree/install-tree.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { files: ["main.cpp"] qbs.installPrefix: "" diff --git a/tests/auto/blackbox/testdata/installable-as-auxiliary-input/installable-as-auxiliary-input.qbs b/tests/auto/blackbox/testdata/installable-as-auxiliary-input/installable-as-auxiliary-input.qbs index 75ff10c80..2d37e85d6 100644 --- a/tests/auto/blackbox/testdata/installable-as-auxiliary-input/installable-as-auxiliary-input.qbs +++ b/tests/auto/blackbox/testdata/installable-as-auxiliary-input/installable-as-auxiliary-input.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.File import qbs.FileInfo import qbs.TextFile diff --git a/tests/auto/blackbox/testdata/installable/installable.qbs b/tests/auto/blackbox/testdata/installable/installable.qbs index eeb0875ad..56feb6ec5 100644 --- a/tests/auto/blackbox/testdata/installable/installable.qbs +++ b/tests/auto/blackbox/testdata/installable/installable.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.TextFile Project { diff --git a/tests/auto/blackbox/testdata/installed-source-files/installed-source-files.qbs b/tests/auto/blackbox/testdata/installed-source-files/installed-source-files.qbs index fca3fcca3..7b4d30091 100644 --- a/tests/auto/blackbox/testdata/installed-source-files/installed-source-files.qbs +++ b/tests/auto/blackbox/testdata/installed-source-files/installed-source-files.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { consoleApplication: true files: ["main.cpp"] diff --git a/tests/auto/blackbox/testdata/installed-transformer-output/qbs668.qbs b/tests/auto/blackbox/testdata/installed-transformer-output/qbs668.qbs index 244f80abe..aa40b7691 100644 --- a/tests/auto/blackbox/testdata/installed-transformer-output/qbs668.qbs +++ b/tests/auto/blackbox/testdata/installed-transformer-output/qbs668.qbs @@ -1,4 +1,3 @@ -import qbs 1.0 import qbs.TextFile Product { diff --git a/tests/auto/blackbox/testdata/installed_artifact/installed_artifact.qbs b/tests/auto/blackbox/testdata/installed_artifact/installed_artifact.qbs index d1f9f54ea..f7ae7f5e0 100644 --- a/tests/auto/blackbox/testdata/installed_artifact/installed_artifact.qbs +++ b/tests/auto/blackbox/testdata/installed_artifact/installed_artifact.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Application { name: "installedApp" type: "application" diff --git a/tests/auto/blackbox/testdata/installpackage/installpackage.qbs b/tests/auto/blackbox/testdata/installpackage/installpackage.qbs index d04ecdd57..190e3f5ef 100644 --- a/tests/auto/blackbox/testdata/installpackage/installpackage.qbs +++ b/tests/auto/blackbox/testdata/installpackage/installpackage.qbs @@ -1,5 +1,3 @@ -import qbs - Project { CppApplication { name: "public_tool" diff --git a/tests/auto/blackbox/testdata/invalid-command-property/invalid-command-property.qbs b/tests/auto/blackbox/testdata/invalid-command-property/invalid-command-property.qbs index 65437311e..28bcca827 100644 --- a/tests/auto/blackbox/testdata/invalid-command-property/invalid-command-property.qbs +++ b/tests/auto/blackbox/testdata/invalid-command-property/invalid-command-property.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.TextFile Product { diff --git a/tests/auto/blackbox/testdata/invalid-extension-instantiation/invalid-extension-instantiation.qbs b/tests/auto/blackbox/testdata/invalid-extension-instantiation/invalid-extension-instantiation.qbs index ad2f55da4..d5e4dd5c7 100644 --- a/tests/auto/blackbox/testdata/invalid-extension-instantiation/invalid-extension-instantiation.qbs +++ b/tests/auto/blackbox/testdata/invalid-extension-instantiation/invalid-extension-instantiation.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Environment import qbs.File import qbs.FileInfo diff --git a/tests/auto/blackbox/testdata/invalid-install-dir/invalid-install-dir.qbs b/tests/auto/blackbox/testdata/invalid-install-dir/invalid-install-dir.qbs index ffa92dabb..57505712c 100644 --- a/tests/auto/blackbox/testdata/invalid-install-dir/invalid-install-dir.qbs +++ b/tests/auto/blackbox/testdata/invalid-install-dir/invalid-install-dir.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { consoleApplication: true files: ["main.cpp"] diff --git a/tests/auto/blackbox/testdata/invalid-library-names/invalid-library-names.qbs b/tests/auto/blackbox/testdata/invalid-library-names/invalid-library-names.qbs index 1ddfecd38..659b39962 100644 --- a/tests/auto/blackbox/testdata/invalid-library-names/invalid-library-names.qbs +++ b/tests/auto/blackbox/testdata/invalid-library-names/invalid-library-names.qbs @@ -1,5 +1,3 @@ -import qbs - Project { minimumQbsVersion: "1.6" property var values: [null, undefined, 5, [], ""] diff --git a/tests/auto/blackbox/testdata/jsextensions-binaryfile/binaryfile.qbs b/tests/auto/blackbox/testdata/jsextensions-binaryfile/binaryfile.qbs index bf6d4a4cf..1e7426744 100644 --- a/tests/auto/blackbox/testdata/jsextensions-binaryfile/binaryfile.qbs +++ b/tests/auto/blackbox/testdata/jsextensions-binaryfile/binaryfile.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.BinaryFile Product { diff --git a/tests/auto/blackbox/testdata/jsextensions-file/file.qbs b/tests/auto/blackbox/testdata/jsextensions-file/file.qbs index 93b61d38d..6adf714e2 100644 --- a/tests/auto/blackbox/testdata/jsextensions-file/file.qbs +++ b/tests/auto/blackbox/testdata/jsextensions-file/file.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.File import qbs.FileInfo import qbs.TextFile diff --git a/tests/auto/blackbox/testdata/jsextensions-fileinfo/fileinfo.qbs b/tests/auto/blackbox/testdata/jsextensions-fileinfo/fileinfo.qbs index 99d872b19..244f2122e 100644 --- a/tests/auto/blackbox/testdata/jsextensions-fileinfo/fileinfo.qbs +++ b/tests/auto/blackbox/testdata/jsextensions-fileinfo/fileinfo.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.FileInfo import qbs.TextFile diff --git a/tests/auto/blackbox/testdata/jsextensions-process/process.qbs b/tests/auto/blackbox/testdata/jsextensions-process/process.qbs index 730468b3a..be9e718df 100644 --- a/tests/auto/blackbox/testdata/jsextensions-process/process.qbs +++ b/tests/auto/blackbox/testdata/jsextensions-process/process.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Environment import qbs.FileInfo import qbs.Process diff --git a/tests/auto/blackbox/testdata/jsextensions-propertylist/propertylist.qbs b/tests/auto/blackbox/testdata/jsextensions-propertylist/propertylist.qbs index a70b81625..aa1351543 100644 --- a/tests/auto/blackbox/testdata/jsextensions-propertylist/propertylist.qbs +++ b/tests/auto/blackbox/testdata/jsextensions-propertylist/propertylist.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Process import qbs.PropertyList import qbs.TextFile diff --git a/tests/auto/blackbox/testdata/jsextensions-temporarydir/jsextensions-temporarydir.qbs b/tests/auto/blackbox/testdata/jsextensions-temporarydir/jsextensions-temporarydir.qbs index fb54a45ec..c540e9196 100644 --- a/tests/auto/blackbox/testdata/jsextensions-temporarydir/jsextensions-temporarydir.qbs +++ b/tests/auto/blackbox/testdata/jsextensions-temporarydir/jsextensions-temporarydir.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.File import qbs.TemporaryDir diff --git a/tests/auto/blackbox/testdata/jsextensions-textfile/textfile.qbs b/tests/auto/blackbox/testdata/jsextensions-textfile/textfile.qbs index 44c142745..62b54b131 100644 --- a/tests/auto/blackbox/testdata/jsextensions-textfile/textfile.qbs +++ b/tests/auto/blackbox/testdata/jsextensions-textfile/textfile.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.TextFile Product { diff --git a/tests/auto/blackbox/testdata/ld/ld.qbs b/tests/auto/blackbox/testdata/ld/ld.qbs index f95157012..25fede1b0 100644 --- a/tests/auto/blackbox/testdata/ld/ld.qbs +++ b/tests/auto/blackbox/testdata/ld/ld.qbs @@ -1,5 +1,3 @@ -import qbs - Project { Library { Depends { name: "cpp" } diff --git a/tests/auto/blackbox/testdata/lexyacc/lex_outfile/lex_outfile.qbs b/tests/auto/blackbox/testdata/lexyacc/lex_outfile/lex_outfile.qbs index 3708140ad..61f76f4be 100644 --- a/tests/auto/blackbox/testdata/lexyacc/lex_outfile/lex_outfile.qbs +++ b/tests/auto/blackbox/testdata/lexyacc/lex_outfile/lex_outfile.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { qbsSearchPaths: ".." Depends { name: "bisonhelper" } diff --git a/tests/auto/blackbox/testdata/lexyacc/lex_prefix/lex_prefix.qbs b/tests/auto/blackbox/testdata/lexyacc/lex_prefix/lex_prefix.qbs index 3708140ad..61f76f4be 100644 --- a/tests/auto/blackbox/testdata/lexyacc/lex_prefix/lex_prefix.qbs +++ b/tests/auto/blackbox/testdata/lexyacc/lex_prefix/lex_prefix.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { qbsSearchPaths: ".." Depends { name: "bisonhelper" } diff --git a/tests/auto/blackbox/testdata/lexyacc/one-grammar/one-grammar.qbs b/tests/auto/blackbox/testdata/lexyacc/one-grammar/one-grammar.qbs index 3708140ad..61f76f4be 100644 --- a/tests/auto/blackbox/testdata/lexyacc/one-grammar/one-grammar.qbs +++ b/tests/auto/blackbox/testdata/lexyacc/one-grammar/one-grammar.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { qbsSearchPaths: ".." Depends { name: "bisonhelper" } diff --git a/tests/auto/blackbox/testdata/lexyacc/two-grammars/two-grammars.qbs b/tests/auto/blackbox/testdata/lexyacc/two-grammars/two-grammars.qbs index fb1375598..7b0c1e515 100644 --- a/tests/auto/blackbox/testdata/lexyacc/two-grammars/two-grammars.qbs +++ b/tests/auto/blackbox/testdata/lexyacc/two-grammars/two-grammars.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { Depends { name: "lex_yacc" } consoleApplication: true diff --git a/tests/auto/blackbox/testdata/lexyacc/yacc_output/yacc_output.qbs b/tests/auto/blackbox/testdata/lexyacc/yacc_output/yacc_output.qbs index 298190996..7e89b317e 100644 --- a/tests/auto/blackbox/testdata/lexyacc/yacc_output/yacc_output.qbs +++ b/tests/auto/blackbox/testdata/lexyacc/yacc_output/yacc_output.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { Depends { name: "lex_yacc" } lex_yacc.outputTag: "cpp" diff --git a/tests/auto/blackbox/testdata/linkerMode/linkerMode.qbs b/tests/auto/blackbox/testdata/linkerMode/linkerMode.qbs index 05e3eabed..1be50c0aa 100644 --- a/tests/auto/blackbox/testdata/linkerMode/linkerMode.qbs +++ b/tests/auto/blackbox/testdata/linkerMode/linkerMode.qbs @@ -1,5 +1,3 @@ -import qbs - Project { CppApplication { consoleApplication: true diff --git a/tests/auto/blackbox/testdata/linkerscripts/linkerscripts.qbs b/tests/auto/blackbox/testdata/linkerscripts/linkerscripts.qbs index 1601baf3c..b30a498bb 100644 --- a/tests/auto/blackbox/testdata/linkerscripts/linkerscripts.qbs +++ b/tests/auto/blackbox/testdata/linkerscripts/linkerscripts.qbs @@ -1,5 +1,3 @@ -import qbs - DynamicLibrary { type: base.concat("custom") Depends { name: "cpp" } diff --git a/tests/auto/blackbox/testdata/list-products/list-products.qbs b/tests/auto/blackbox/testdata/list-products/list-products.qbs index 559a7d274..5431b9371 100644 --- a/tests/auto/blackbox/testdata/list-products/list-products.qbs +++ b/tests/auto/blackbox/testdata/list-products/list-products.qbs @@ -1,5 +1,3 @@ -import qbs - Project { Product { name: "a" diff --git a/tests/auto/blackbox/testdata/list-properties-with-outer/list-properties-with-outer.qbs b/tests/auto/blackbox/testdata/list-properties-with-outer/list-properties-with-outer.qbs index 3b0b3be49..ba157a7ac 100644 --- a/tests/auto/blackbox/testdata/list-properties-with-outer/list-properties-with-outer.qbs +++ b/tests/auto/blackbox/testdata/list-properties-with-outer/list-properties-with-outer.qbs @@ -1,5 +1,3 @@ -import qbs - Product { type: ["outtype"] Depends { name: "higher" } diff --git a/tests/auto/blackbox/testdata/list-properties-with-outer/modules/higher/higher.qbs b/tests/auto/blackbox/testdata/list-properties-with-outer/modules/higher/higher.qbs index a8d1b186f..ddb7b6f40 100644 --- a/tests/auto/blackbox/testdata/list-properties-with-outer/modules/higher/higher.qbs +++ b/tests/auto/blackbox/testdata/list-properties-with-outer/modules/higher/higher.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Depends { name: "lower" } lower.listProp: ["higher"] diff --git a/tests/auto/blackbox/testdata/list-properties-with-outer/modules/lower/lower.qbs b/tests/auto/blackbox/testdata/list-properties-with-outer/modules/lower/lower.qbs index 6f9597788..63c97aa76 100644 --- a/tests/auto/blackbox/testdata/list-properties-with-outer/modules/lower/lower.qbs +++ b/tests/auto/blackbox/testdata/list-properties-with-outer/modules/lower/lower.qbs @@ -1,5 +1,3 @@ -import qbs - Module { property stringList listProp diff --git a/tests/auto/blackbox/testdata/list-property-order/modules/higher1/higher1.qbs b/tests/auto/blackbox/testdata/list-property-order/modules/higher1/higher1.qbs index c56dd33bc..67c7c790a 100644 --- a/tests/auto/blackbox/testdata/list-property-order/modules/higher1/higher1.qbs +++ b/tests/auto/blackbox/testdata/list-property-order/modules/higher1/higher1.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Depends { name: "lower" } lower.listProp: ["higher1"] diff --git a/tests/auto/blackbox/testdata/list-property-order/modules/higher2/higher2.qbs b/tests/auto/blackbox/testdata/list-property-order/modules/higher2/higher2.qbs index 75600ffa4..3ca22f51c 100644 --- a/tests/auto/blackbox/testdata/list-property-order/modules/higher2/higher2.qbs +++ b/tests/auto/blackbox/testdata/list-property-order/modules/higher2/higher2.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Depends { name: "lower" } lower.listProp: ["higher2"] diff --git a/tests/auto/blackbox/testdata/list-property-order/modules/higher3/higher3.qbs b/tests/auto/blackbox/testdata/list-property-order/modules/higher3/higher3.qbs index 5372b92db..f534cf8bf 100644 --- a/tests/auto/blackbox/testdata/list-property-order/modules/higher3/higher3.qbs +++ b/tests/auto/blackbox/testdata/list-property-order/modules/higher3/higher3.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Depends { name: "lower" } lower.listProp: ["higher3"] diff --git a/tests/auto/blackbox/testdata/list-property-order/modules/lower/lower.qbs b/tests/auto/blackbox/testdata/list-property-order/modules/lower/lower.qbs index eeed377bc..c7462676d 100644 --- a/tests/auto/blackbox/testdata/list-property-order/modules/lower/lower.qbs +++ b/tests/auto/blackbox/testdata/list-property-order/modules/lower/lower.qbs @@ -1,5 +1,3 @@ -import qbs - Module { property stringList listProp diff --git a/tests/auto/blackbox/testdata/list-property-order/product.qbs b/tests/auto/blackbox/testdata/list-property-order/product.qbs index ef5e5c827..e92494693 100644 --- a/tests/auto/blackbox/testdata/list-property-order/product.qbs +++ b/tests/auto/blackbox/testdata/list-property-order/product.qbs @@ -1,5 +1,3 @@ -import qbs - Product { type: "outtype" name: "toplevel" diff --git a/tests/auto/blackbox/testdata/loadablemodule/loadablemodule.qbs b/tests/auto/blackbox/testdata/loadablemodule/loadablemodule.qbs index 15b5906af..ec5b0b358 100644 --- a/tests/auto/blackbox/testdata/loadablemodule/loadablemodule.qbs +++ b/tests/auto/blackbox/testdata/loadablemodule/loadablemodule.qbs @@ -1,5 +1,3 @@ -import qbs - Project { LoadableModule { Depends { name: "cpp" } diff --git a/tests/auto/blackbox/testdata/localDeployment/localDeployment.qbs b/tests/auto/blackbox/testdata/localDeployment/localDeployment.qbs index 2b4d1f241..650f07104 100644 --- a/tests/auto/blackbox/testdata/localDeployment/localDeployment.qbs +++ b/tests/auto/blackbox/testdata/localDeployment/localDeployment.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { Product { type: ["application"] diff --git a/tests/auto/blackbox/testdata/makefile-generator/app.qbs b/tests/auto/blackbox/testdata/makefile-generator/app.qbs index c0f423d5c..dfd67276e 100644 --- a/tests/auto/blackbox/testdata/makefile-generator/app.qbs +++ b/tests/auto/blackbox/testdata/makefile-generator/app.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { name: "the app" consoleApplication: true diff --git a/tests/auto/blackbox/testdata/maximum-c-language-version/maximum-c-language-version.qbs b/tests/auto/blackbox/testdata/maximum-c-language-version/maximum-c-language-version.qbs index 2ac47b66a..320494d00 100644 --- a/tests/auto/blackbox/testdata/maximum-c-language-version/maximum-c-language-version.qbs +++ b/tests/auto/blackbox/testdata/maximum-c-language-version/maximum-c-language-version.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { name: "app" property bool enableNewestModule: true diff --git a/tests/auto/blackbox/testdata/maximum-c-language-version/modules/newermodule/newermodule.qbs b/tests/auto/blackbox/testdata/maximum-c-language-version/modules/newermodule/newermodule.qbs index 4dd343b3b..d5b015e42 100644 --- a/tests/auto/blackbox/testdata/maximum-c-language-version/modules/newermodule/newermodule.qbs +++ b/tests/auto/blackbox/testdata/maximum-c-language-version/modules/newermodule/newermodule.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Depends { name: "cpp" } cpp.cLanguageVersion: "c99" diff --git a/tests/auto/blackbox/testdata/maximum-c-language-version/modules/newestmodule/newestmodule.qbs b/tests/auto/blackbox/testdata/maximum-c-language-version/modules/newestmodule/newestmodule.qbs index f8316a35e..5437957fe 100644 --- a/tests/auto/blackbox/testdata/maximum-c-language-version/modules/newestmodule/newestmodule.qbs +++ b/tests/auto/blackbox/testdata/maximum-c-language-version/modules/newestmodule/newestmodule.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Depends { name: "cpp" } cpp.cLanguageVersion: "c11" diff --git a/tests/auto/blackbox/testdata/maximum-c-language-version/modules/oldmodule/oldmodule.qbs b/tests/auto/blackbox/testdata/maximum-c-language-version/modules/oldmodule/oldmodule.qbs index a753b3e3e..10e530098 100644 --- a/tests/auto/blackbox/testdata/maximum-c-language-version/modules/oldmodule/oldmodule.qbs +++ b/tests/auto/blackbox/testdata/maximum-c-language-version/modules/oldmodule/oldmodule.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Depends { name: "cpp" } cpp.cLanguageVersion: "c90" diff --git a/tests/auto/blackbox/testdata/maximum-cxx-language-version/maximum-cxx-language-version.qbs b/tests/auto/blackbox/testdata/maximum-cxx-language-version/maximum-cxx-language-version.qbs index 5dd298aa8..71933cf60 100644 --- a/tests/auto/blackbox/testdata/maximum-cxx-language-version/maximum-cxx-language-version.qbs +++ b/tests/auto/blackbox/testdata/maximum-cxx-language-version/maximum-cxx-language-version.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { name: "app" property bool enableNewestModule: true diff --git a/tests/auto/blackbox/testdata/maximum-cxx-language-version/modules/newermodule/newermodule.qbs b/tests/auto/blackbox/testdata/maximum-cxx-language-version/modules/newermodule/newermodule.qbs index dfc28b946..88b1da212 100644 --- a/tests/auto/blackbox/testdata/maximum-cxx-language-version/modules/newermodule/newermodule.qbs +++ b/tests/auto/blackbox/testdata/maximum-cxx-language-version/modules/newermodule/newermodule.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Depends { name: "cpp" } cpp.cxxLanguageVersion: "c++14" diff --git a/tests/auto/blackbox/testdata/maximum-cxx-language-version/modules/newestmodule/newestmodule.qbs b/tests/auto/blackbox/testdata/maximum-cxx-language-version/modules/newestmodule/newestmodule.qbs index f306a5389..f99932b10 100644 --- a/tests/auto/blackbox/testdata/maximum-cxx-language-version/modules/newestmodule/newestmodule.qbs +++ b/tests/auto/blackbox/testdata/maximum-cxx-language-version/modules/newestmodule/newestmodule.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Depends { name: "cpp" } cpp.cxxLanguageVersion: "c++17" diff --git a/tests/auto/blackbox/testdata/maximum-cxx-language-version/modules/oldmodule/oldmodule.qbs b/tests/auto/blackbox/testdata/maximum-cxx-language-version/modules/oldmodule/oldmodule.qbs index b05c855a3..73d3bf16a 100644 --- a/tests/auto/blackbox/testdata/maximum-cxx-language-version/modules/oldmodule/oldmodule.qbs +++ b/tests/auto/blackbox/testdata/maximum-cxx-language-version/modules/oldmodule/oldmodule.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Depends { name: "cpp" } cpp.cxxLanguageVersion: "c++11" diff --git a/tests/auto/blackbox/testdata/minimumSystemVersion/fakewindows.qbs b/tests/auto/blackbox/testdata/minimumSystemVersion/fakewindows.qbs index f536da6ac..1a56e0b7e 100644 --- a/tests/auto/blackbox/testdata/minimumSystemVersion/fakewindows.qbs +++ b/tests/auto/blackbox/testdata/minimumSystemVersion/fakewindows.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Utilities // non-existent versions of Windows should print a QBS warning diff --git a/tests/auto/blackbox/testdata/minimumSystemVersion/macappstore.qbs b/tests/auto/blackbox/testdata/minimumSystemVersion/macappstore.qbs index 3f214fed2..400bc9397 100644 --- a/tests/auto/blackbox/testdata/minimumSystemVersion/macappstore.qbs +++ b/tests/auto/blackbox/testdata/minimumSystemVersion/macappstore.qbs @@ -1,5 +1,3 @@ -import qbs - // just to make sure three-digit minimum versions work on macOS // this only affects the value of __MAC_OS_X_VERSION_MIN_REQUIRED, // not the actual LC_VERSION_MIN_MACOSX command which is limited to two diff --git a/tests/auto/blackbox/testdata/minimumSystemVersion/specific.qbs b/tests/auto/blackbox/testdata/minimumSystemVersion/specific.qbs index 0d033b394..b0b7a7a9b 100644 --- a/tests/auto/blackbox/testdata/minimumSystemVersion/specific.qbs +++ b/tests/auto/blackbox/testdata/minimumSystemVersion/specific.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Utilities // a specific version of the operating systems is specified diff --git a/tests/auto/blackbox/testdata/minimumSystemVersion/unspecified-forced.qbs b/tests/auto/blackbox/testdata/minimumSystemVersion/unspecified-forced.qbs index 2285e20ba..a5ea620fd 100644 --- a/tests/auto/blackbox/testdata/minimumSystemVersion/unspecified-forced.qbs +++ b/tests/auto/blackbox/testdata/minimumSystemVersion/unspecified-forced.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Utilities // no minimum versions are specified, and explicitly set to undefined in diff --git a/tests/auto/blackbox/testdata/minimumSystemVersion/unspecified.qbs b/tests/auto/blackbox/testdata/minimumSystemVersion/unspecified.qbs index ac0a7abdc..0eeb2d547 100644 --- a/tests/auto/blackbox/testdata/minimumSystemVersion/unspecified.qbs +++ b/tests/auto/blackbox/testdata/minimumSystemVersion/unspecified.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Utilities // no minimum versions are specified so the profile defaults will be used diff --git a/tests/auto/blackbox/testdata/missing-dependency/missing-dependency.qbs b/tests/auto/blackbox/testdata/missing-dependency/missing-dependency.qbs index a30ac2a70..6bb8b96f2 100644 --- a/tests/auto/blackbox/testdata/missing-dependency/missing-dependency.qbs +++ b/tests/auto/blackbox/testdata/missing-dependency/missing-dependency.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.TextFile Project { diff --git a/tests/auto/blackbox/testdata/missing-override-prefix/missing-override-prefix.qbs b/tests/auto/blackbox/testdata/missing-override-prefix/missing-override-prefix.qbs index 6d16a3c53..86718b571 100644 --- a/tests/auto/blackbox/testdata/missing-override-prefix/missing-override-prefix.qbs +++ b/tests/auto/blackbox/testdata/missing-override-prefix/missing-override-prefix.qbs @@ -1,3 +1 @@ -import qbs - Product { } diff --git a/tests/auto/blackbox/testdata/missing-project-file/project-dir/missing-project-file.qbs b/tests/auto/blackbox/testdata/missing-project-file/project-dir/missing-project-file.qbs index a294cbd24..421bad1f0 100644 --- a/tests/auto/blackbox/testdata/missing-project-file/project-dir/missing-project-file.qbs +++ b/tests/auto/blackbox/testdata/missing-project-file/project-dir/missing-project-file.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { files: [ "file.cpp", diff --git a/tests/auto/blackbox/testdata/moved-file-dependency/moved-file-dependency.qbs b/tests/auto/blackbox/testdata/moved-file-dependency/moved-file-dependency.qbs index 6252f98ed..797198686 100644 --- a/tests/auto/blackbox/testdata/moved-file-dependency/moved-file-dependency.qbs +++ b/tests/auto/blackbox/testdata/moved-file-dependency/moved-file-dependency.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { cpp.includePaths: ["subdir1", "subdir2"] files: ["main.cpp"] diff --git a/tests/auto/blackbox/testdata/multiple-changes/multiple-changes.qbs b/tests/auto/blackbox/testdata/multiple-changes/multiple-changes.qbs index 254e2b4da..51e6b1a5c 100644 --- a/tests/auto/blackbox/testdata/multiple-changes/multiple-changes.qbs +++ b/tests/auto/blackbox/testdata/multiple-changes/multiple-changes.qbs @@ -1,5 +1,3 @@ -import qbs - Project { property bool prop: false Product { diff --git a/tests/auto/blackbox/testdata/multiple-configurations/multiple-configurations.qbs b/tests/auto/blackbox/testdata/multiple-configurations/multiple-configurations.qbs index f8371e983..f6fd16ba2 100644 --- a/tests/auto/blackbox/testdata/multiple-configurations/multiple-configurations.qbs +++ b/tests/auto/blackbox/testdata/multiple-configurations/multiple-configurations.qbs @@ -1,5 +1,3 @@ -import qbs - Project { StaticLibrary { name: "lib" diff --git a/tests/auto/blackbox/testdata/multiplexed-tool/multiplexed-tool.qbs b/tests/auto/blackbox/testdata/multiplexed-tool/multiplexed-tool.qbs index b36ea5be9..3994bd95f 100644 --- a/tests/auto/blackbox/testdata/multiplexed-tool/multiplexed-tool.qbs +++ b/tests/auto/blackbox/testdata/multiplexed-tool/multiplexed-tool.qbs @@ -1,5 +1,3 @@ -import qbs - Project { CppApplication { name: "tool" diff --git a/tests/auto/blackbox/testdata/nested-groups/modules/themodule/themodule.qbs b/tests/auto/blackbox/testdata/nested-groups/modules/themodule/themodule.qbs index ffca11cdf..73426ddf5 100644 --- a/tests/auto/blackbox/testdata/nested-groups/modules/themodule/themodule.qbs +++ b/tests/auto/blackbox/testdata/nested-groups/modules/themodule/themodule.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Group { cpp.defines: ["REQUIRED_FOR_FILE3"] diff --git a/tests/auto/blackbox/testdata/nested-groups/nested-groups.qbs b/tests/auto/blackbox/testdata/nested-groups/nested-groups.qbs index 827eda64e..88f5ae30e 100644 --- a/tests/auto/blackbox/testdata/nested-groups/nested-groups.qbs +++ b/tests/auto/blackbox/testdata/nested-groups/nested-groups.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { consoleApplication: true Depends { name: "themodule" } diff --git a/tests/auto/blackbox/testdata/nested-properties/modules/higherlevel/higher-level.qbs b/tests/auto/blackbox/testdata/nested-properties/modules/higherlevel/higher-level.qbs index a3c117efd..071737c36 100644 --- a/tests/auto/blackbox/testdata/nested-properties/modules/higherlevel/higher-level.qbs +++ b/tests/auto/blackbox/testdata/nested-properties/modules/higherlevel/higher-level.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Depends { name: "lowerlevel" } lowerlevel.propDependency: "value in higherlevel" diff --git a/tests/auto/blackbox/testdata/nested-properties/modules/lowerlevel/lower-level.qbs b/tests/auto/blackbox/testdata/nested-properties/modules/lowerlevel/lower-level.qbs index 60ddc219b..f8b6a7dc0 100644 --- a/tests/auto/blackbox/testdata/nested-properties/modules/lowerlevel/lower-level.qbs +++ b/tests/auto/blackbox/testdata/nested-properties/modules/lowerlevel/lower-level.qbs @@ -1,5 +1,3 @@ -import qbs - Module { property string propDependency: "value in lowerlevel module" property string prop: propDependency diff --git a/tests/auto/blackbox/testdata/nested-properties/product.qbs b/tests/auto/blackbox/testdata/nested-properties/product.qbs index 916cee151..e38813b72 100644 --- a/tests/auto/blackbox/testdata/nested-properties/product.qbs +++ b/tests/auto/blackbox/testdata/nested-properties/product.qbs @@ -1,5 +1,3 @@ -import qbs - Project { Product { name: "dep" diff --git a/tests/auto/blackbox/testdata/new-output-artifact/new-output-artifact.qbs b/tests/auto/blackbox/testdata/new-output-artifact/new-output-artifact.qbs index fa70aee8d..b297a3f61 100644 --- a/tests/auto/blackbox/testdata/new-output-artifact/new-output-artifact.qbs +++ b/tests/auto/blackbox/testdata/new-output-artifact/new-output-artifact.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.TextFile Product { diff --git a/tests/auto/blackbox/testdata/no-profile/no-profile.qbs b/tests/auto/blackbox/testdata/no-profile/no-profile.qbs index cc251c6ab..6fd7dd07a 100644 --- a/tests/auto/blackbox/testdata/no-profile/no-profile.qbs +++ b/tests/auto/blackbox/testdata/no-profile/no-profile.qbs @@ -1,5 +1,3 @@ -import qbs - Product { property bool dummy: { console.info("profile: " + project.profile); } } diff --git a/tests/auto/blackbox/testdata/nodejs/hello.qbs b/tests/auto/blackbox/testdata/nodejs/hello.qbs index d5e92209a..c19e455db 100644 --- a/tests/auto/blackbox/testdata/nodejs/hello.qbs +++ b/tests/auto/blackbox/testdata/nodejs/hello.qbs @@ -1,5 +1,3 @@ -import qbs - NodeJSApplication { nodejs.applicationFile: "hello.js" name: "hello" diff --git a/tests/auto/blackbox/testdata/non-broken-files-in-broken-product/non-broken-files-in-broken-product.qbs b/tests/auto/blackbox/testdata/non-broken-files-in-broken-product/non-broken-files-in-broken-product.qbs index 1ec764dfa..abd41fb6b 100644 --- a/tests/auto/blackbox/testdata/non-broken-files-in-broken-product/non-broken-files-in-broken-product.qbs +++ b/tests/auto/blackbox/testdata/non-broken-files-in-broken-product/non-broken-files-in-broken-product.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { consoleApplication: true files: ["fine.cpp", "broken.cpp"] diff --git a/tests/auto/blackbox/testdata/non-default-product/non-default-product.qbs b/tests/auto/blackbox/testdata/non-default-product/non-default-product.qbs index 498344975..6e006e831 100644 --- a/tests/auto/blackbox/testdata/non-default-product/non-default-product.qbs +++ b/tests/auto/blackbox/testdata/non-default-product/non-default-product.qbs @@ -1,5 +1,3 @@ -import qbs - Project { CppApplication { name: "default app" diff --git a/tests/auto/blackbox/testdata/nsis/hello.qbs b/tests/auto/blackbox/testdata/nsis/hello.qbs index b7f3da505..a161a6998 100644 --- a/tests/auto/blackbox/testdata/nsis/hello.qbs +++ b/tests/auto/blackbox/testdata/nsis/hello.qbs @@ -1,5 +1,3 @@ -import qbs - NSISSetup { condition: qbs.targetOS.contains("windows") name: "Qbs Hello" diff --git a/tests/auto/blackbox/testdata/nsisDependencies/nsisDependencies.qbs b/tests/auto/blackbox/testdata/nsisDependencies/nsisDependencies.qbs index 1d1e5c067..d8185aabf 100644 --- a/tests/auto/blackbox/testdata/nsisDependencies/nsisDependencies.qbs +++ b/tests/auto/blackbox/testdata/nsisDependencies/nsisDependencies.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.FileInfo import qbs.TextFile diff --git a/tests/auto/blackbox/testdata/out-of-date-marking/out-of-date-marking.qbs b/tests/auto/blackbox/testdata/out-of-date-marking/out-of-date-marking.qbs index 1ef57bae7..d52246578 100644 --- a/tests/auto/blackbox/testdata/out-of-date-marking/out-of-date-marking.qbs +++ b/tests/auto/blackbox/testdata/out-of-date-marking/out-of-date-marking.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.TextFile CppApplication { diff --git a/tests/auto/blackbox/testdata/output-artifact-auto-tagging/output-artifact-auto-tagging.qbs b/tests/auto/blackbox/testdata/output-artifact-auto-tagging/output-artifact-auto-tagging.qbs index a9090f3db..7ec8fd916 100644 --- a/tests/auto/blackbox/testdata/output-artifact-auto-tagging/output-artifact-auto-tagging.qbs +++ b/tests/auto/blackbox/testdata/output-artifact-auto-tagging/output-artifact-auto-tagging.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.File CppApplication { diff --git a/tests/auto/blackbox/testdata/overrideProjectProperties/helper_lib.qbs b/tests/auto/blackbox/testdata/overrideProjectProperties/helper_lib.qbs index b26b0f31f..b69dd0da8 100644 --- a/tests/auto/blackbox/testdata/overrideProjectProperties/helper_lib.qbs +++ b/tests/auto/blackbox/testdata/overrideProjectProperties/helper_lib.qbs @@ -1,5 +1,3 @@ -import qbs - DynamicLibrary { name: "helperLib" files: "helperlib.cpp" diff --git a/tests/auto/blackbox/testdata/overrideProjectProperties/overrideProjectProperties.qbs b/tests/auto/blackbox/testdata/overrideProjectProperties/overrideProjectProperties.qbs index 6e8ef62a1..650606fbd 100644 --- a/tests/auto/blackbox/testdata/overrideProjectProperties/overrideProjectProperties.qbs +++ b/tests/auto/blackbox/testdata/overrideProjectProperties/overrideProjectProperties.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { property string nameSuffix: "" property bool someBool diff --git a/tests/auto/blackbox/testdata/overrideProjectProperties/project_using_helper_lib.qbs b/tests/auto/blackbox/testdata/overrideProjectProperties/project_using_helper_lib.qbs index c61716e6e..1eb21cdd1 100644 --- a/tests/auto/blackbox/testdata/overrideProjectProperties/project_using_helper_lib.qbs +++ b/tests/auto/blackbox/testdata/overrideProjectProperties/project_using_helper_lib.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { property bool linkSuccessfully: false references: linkSuccessfully ? ["helper_lib.qbs"] : [] diff --git a/tests/auto/blackbox/testdata/pch-change-tracking/pch-change-tracking.qbs b/tests/auto/blackbox/testdata/pch-change-tracking/pch-change-tracking.qbs index 2cfb17337..3da526fdb 100644 --- a/tests/auto/blackbox/testdata/pch-change-tracking/pch-change-tracking.qbs +++ b/tests/auto/blackbox/testdata/pch-change-tracking/pch-change-tracking.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { files: [ "header1.h", diff --git a/tests/auto/blackbox/testdata/per-group-define-in-export-item/per-group-define-in-export-item.qbs b/tests/auto/blackbox/testdata/per-group-define-in-export-item/per-group-define-in-export-item.qbs index 514de7ecb..a81b8f6c9 100644 --- a/tests/auto/blackbox/testdata/per-group-define-in-export-item/per-group-define-in-export-item.qbs +++ b/tests/auto/blackbox/testdata/per-group-define-in-export-item/per-group-define-in-export-item.qbs @@ -1,5 +1,3 @@ -import qbs - Project { Product { name: "dep" diff --git a/tests/auto/blackbox/testdata/pkg-config-probe-sysroot/modules/themodule/themodule.qbs b/tests/auto/blackbox/testdata/pkg-config-probe-sysroot/modules/themodule/themodule.qbs index ecbfd6c9d..991876f6b 100644 --- a/tests/auto/blackbox/testdata/pkg-config-probe-sysroot/modules/themodule/themodule.qbs +++ b/tests/auto/blackbox/testdata/pkg-config-probe-sysroot/modules/themodule/themodule.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Probes Module { diff --git a/tests/auto/blackbox/testdata/pkg-config-probe-sysroot/pkg-config.qbs b/tests/auto/blackbox/testdata/pkg-config-probe-sysroot/pkg-config.qbs index 0eac3cca0..11498ebdb 100644 --- a/tests/auto/blackbox/testdata/pkg-config-probe-sysroot/pkg-config.qbs +++ b/tests/auto/blackbox/testdata/pkg-config-probe-sysroot/pkg-config.qbs @@ -1,5 +1,3 @@ -import qbs - Project { property string packageBaseName diff --git a/tests/auto/blackbox/testdata/pkg-config-probe/modules/themodule/themodule.qbs b/tests/auto/blackbox/testdata/pkg-config-probe/modules/themodule/themodule.qbs index 8edd218c3..d5488da1f 100644 --- a/tests/auto/blackbox/testdata/pkg-config-probe/modules/themodule/themodule.qbs +++ b/tests/auto/blackbox/testdata/pkg-config-probe/modules/themodule/themodule.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Probes Module { diff --git a/tests/auto/blackbox/testdata/pkg-config-probe/pkg-config.qbs b/tests/auto/blackbox/testdata/pkg-config-probe/pkg-config.qbs index db831fbc2..d4dc3b92b 100644 --- a/tests/auto/blackbox/testdata/pkg-config-probe/pkg-config.qbs +++ b/tests/auto/blackbox/testdata/pkg-config-probe/pkg-config.qbs @@ -1,5 +1,3 @@ -import qbs - Project { property string packageBaseName diff --git a/tests/auto/blackbox/testdata/plugin-dependency/plugin-dependency.qbs b/tests/auto/blackbox/testdata/plugin-dependency/plugin-dependency.qbs index 3ae2f3c9a..e89371528 100644 --- a/tests/auto/blackbox/testdata/plugin-dependency/plugin-dependency.qbs +++ b/tests/auto/blackbox/testdata/plugin-dependency/plugin-dependency.qbs @@ -1,5 +1,3 @@ -import qbs - Project { CppApplication { name: "myapp" diff --git a/tests/auto/blackbox/testdata/precompiled-and-prefix-headers/precompiled-and-prefix-headers.qbs b/tests/auto/blackbox/testdata/precompiled-and-prefix-headers/precompiled-and-prefix-headers.qbs index b30f76874..bbd524e23 100644 --- a/tests/auto/blackbox/testdata/precompiled-and-prefix-headers/precompiled-and-prefix-headers.qbs +++ b/tests/auto/blackbox/testdata/precompiled-and-prefix-headers/precompiled-and-prefix-headers.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { name: "MyApp" consoleApplication: true diff --git a/tests/auto/blackbox/testdata/prevent-floating-point-values/prevent-floating-point-values.qbs b/tests/auto/blackbox/testdata/prevent-floating-point-values/prevent-floating-point-values.qbs index 619e44f20..bd1d3162a 100644 --- a/tests/auto/blackbox/testdata/prevent-floating-point-values/prevent-floating-point-values.qbs +++ b/tests/auto/blackbox/testdata/prevent-floating-point-values/prevent-floating-point-values.qbs @@ -1,5 +1,3 @@ -import qbs - Product { name: "p" property bool dummy: { console.info("version: " + version); } diff --git a/tests/auto/blackbox/testdata/probe-change-tracking/probe-change-tracking.qbs b/tests/auto/blackbox/testdata/probe-change-tracking/probe-change-tracking.qbs index ff37985a4..6007a33ac 100644 --- a/tests/auto/blackbox/testdata/probe-change-tracking/probe-change-tracking.qbs +++ b/tests/auto/blackbox/testdata/probe-change-tracking/probe-change-tracking.qbs @@ -1,5 +1,3 @@ -import qbs - Project { Probe { id: tlpProbe diff --git a/tests/auto/blackbox/testdata/probe-in-exported-module/dependee.qbs b/tests/auto/blackbox/testdata/probe-in-exported-module/dependee.qbs index 121ec6c39..fe81cf55c 100644 --- a/tests/auto/blackbox/testdata/probe-in-exported-module/dependee.qbs +++ b/tests/auto/blackbox/testdata/probe-in-exported-module/dependee.qbs @@ -1,5 +1,3 @@ -import qbs - Product { name: "dependee" Depends { name: "myothermodule" } diff --git a/tests/auto/blackbox/testdata/probe-in-exported-module/dependency.qbs b/tests/auto/blackbox/testdata/probe-in-exported-module/dependency.qbs index 1413777dc..eea5180ef 100644 --- a/tests/auto/blackbox/testdata/probe-in-exported-module/dependency.qbs +++ b/tests/auto/blackbox/testdata/probe-in-exported-module/dependency.qbs @@ -1,5 +1,3 @@ -import qbs - Product { name: "dependency" Export { diff --git a/tests/auto/blackbox/testdata/probe-in-exported-module/modules/depmodule/depmodule.qbs b/tests/auto/blackbox/testdata/probe-in-exported-module/modules/depmodule/depmodule.qbs index a9a27edb4..41c6cfe50 100644 --- a/tests/auto/blackbox/testdata/probe-in-exported-module/modules/depmodule/depmodule.qbs +++ b/tests/auto/blackbox/testdata/probe-in-exported-module/modules/depmodule/depmodule.qbs @@ -1,5 +1,3 @@ -import qbs - Module { property string prop property stringList listProp: [] diff --git a/tests/auto/blackbox/testdata/probe-in-exported-module/modules/mymodule/mymodule.qbs b/tests/auto/blackbox/testdata/probe-in-exported-module/modules/mymodule/mymodule.qbs index 622dcf0ec..89d544f7e 100644 --- a/tests/auto/blackbox/testdata/probe-in-exported-module/modules/mymodule/mymodule.qbs +++ b/tests/auto/blackbox/testdata/probe-in-exported-module/modules/mymodule/mymodule.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Depends { name: "depmodule" } Probe { diff --git a/tests/auto/blackbox/testdata/probe-in-exported-module/modules/myothermodule/myothermodule.qbs b/tests/auto/blackbox/testdata/probe-in-exported-module/modules/myothermodule/myothermodule.qbs index d3009f532..4ea5dd077 100644 --- a/tests/auto/blackbox/testdata/probe-in-exported-module/modules/myothermodule/myothermodule.qbs +++ b/tests/auto/blackbox/testdata/probe-in-exported-module/modules/myothermodule/myothermodule.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Depends { name: "depmodule" } depmodule.listProp: ["myother"] diff --git a/tests/auto/blackbox/testdata/probe-in-exported-module/probe-in-exported-module.qbs b/tests/auto/blackbox/testdata/probe-in-exported-module/probe-in-exported-module.qbs index 4e0f13f60..398090195 100644 --- a/tests/auto/blackbox/testdata/probe-in-exported-module/probe-in-exported-module.qbs +++ b/tests/auto/blackbox/testdata/probe-in-exported-module/probe-in-exported-module.qbs @@ -1,5 +1,3 @@ -import qbs - Project { references: [ "dependee.qbs", "dependency.qbs" ] } diff --git a/tests/auto/blackbox/testdata/probeProperties/probeProperties.qbs b/tests/auto/blackbox/testdata/probeProperties/probeProperties.qbs index 36842e40b..673e478b8 100644 --- a/tests/auto/blackbox/testdata/probeProperties/probeProperties.qbs +++ b/tests/auto/blackbox/testdata/probeProperties/probeProperties.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Probes CppApplication { diff --git a/tests/auto/blackbox/testdata/probes-and-array-properties/modules/mymodule/mymodule.qbs b/tests/auto/blackbox/testdata/probes-and-array-properties/modules/mymodule/mymodule.qbs index b76cffa00..e5c368a88 100644 --- a/tests/auto/blackbox/testdata/probes-and-array-properties/modules/mymodule/mymodule.qbs +++ b/tests/auto/blackbox/testdata/probes-and-array-properties/modules/mymodule/mymodule.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Probe { id: propProbe diff --git a/tests/auto/blackbox/testdata/probes-and-array-properties/probes-and-array-properties.qbs b/tests/auto/blackbox/testdata/probes-and-array-properties/probes-and-array-properties.qbs index c7d88ec14..70ca8e1de 100644 --- a/tests/auto/blackbox/testdata/probes-and-array-properties/probes-and-array-properties.qbs +++ b/tests/auto/blackbox/testdata/probes-and-array-properties/probes-and-array-properties.qbs @@ -1,5 +1,3 @@ -import qbs - Product { name: "theProduct" type: ["the-output"] diff --git a/tests/auto/blackbox/testdata/probes-and-shadow-products/probes-and-shadow-products.qbs b/tests/auto/blackbox/testdata/probes-and-shadow-products/probes-and-shadow-products.qbs index 660c088a0..19fc67f71 100644 --- a/tests/auto/blackbox/testdata/probes-and-shadow-products/probes-and-shadow-products.qbs +++ b/tests/auto/blackbox/testdata/probes-and-shadow-products/probes-and-shadow-products.qbs @@ -1,5 +1,3 @@ -import qbs - Product { name: "p" multiplexByQbsProperties: "buildVariants" diff --git a/tests/auto/blackbox/testdata/probes-in-nested-modules/modules/inner/inner.qbs b/tests/auto/blackbox/testdata/probes-in-nested-modules/modules/inner/inner.qbs index b6d39b021..5a254b49b 100644 --- a/tests/auto/blackbox/testdata/probes-in-nested-modules/modules/inner/inner.qbs +++ b/tests/auto/blackbox/testdata/probes-in-nested-modules/modules/inner/inner.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Probes Module { diff --git a/tests/auto/blackbox/testdata/probes-in-nested-modules/modules/outer/outer.qbs b/tests/auto/blackbox/testdata/probes-in-nested-modules/modules/outer/outer.qbs index 71b745f44..4472d573b 100644 --- a/tests/auto/blackbox/testdata/probes-in-nested-modules/modules/outer/outer.qbs +++ b/tests/auto/blackbox/testdata/probes-in-nested-modules/modules/outer/outer.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Depends { name: "inner" } diff --git a/tests/auto/blackbox/testdata/probes-in-nested-modules/probes-in-nested-modules.qbs b/tests/auto/blackbox/testdata/probes-in-nested-modules/probes-in-nested-modules.qbs index ffc273e18..877300c1a 100644 --- a/tests/auto/blackbox/testdata/probes-in-nested-modules/probes-in-nested-modules.qbs +++ b/tests/auto/blackbox/testdata/probes-in-nested-modules/probes-in-nested-modules.qbs @@ -1,5 +1,3 @@ -import qbs - Project { Product { name: "a" diff --git a/tests/auto/blackbox/testdata/product-dependencies-by-type/modules/myconfig/myconfig.qbs b/tests/auto/blackbox/testdata/product-dependencies-by-type/modules/myconfig/myconfig.qbs index f3d789842..5bc1fd613 100644 --- a/tests/auto/blackbox/testdata/product-dependencies-by-type/modules/myconfig/myconfig.qbs +++ b/tests/auto/blackbox/testdata/product-dependencies-by-type/modules/myconfig/myconfig.qbs @@ -1,5 +1,3 @@ -import qbs - Module { property bool typeDecider: true } diff --git a/tests/auto/blackbox/testdata/product-dependencies-by-type/product-dependencies-by-type.qbs b/tests/auto/blackbox/testdata/product-dependencies-by-type/product-dependencies-by-type.qbs index 1297a3942..8fa761a2d 100644 --- a/tests/auto/blackbox/testdata/product-dependencies-by-type/product-dependencies-by-type.qbs +++ b/tests/auto/blackbox/testdata/product-dependencies-by-type/product-dependencies-by-type.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.TextFile Project { diff --git a/tests/auto/blackbox/testdata/productproperties/app.qbs b/tests/auto/blackbox/testdata/productproperties/app.qbs index 405d08adb..b867aec3d 100644 --- a/tests/auto/blackbox/testdata/productproperties/app.qbs +++ b/tests/auto/blackbox/testdata/productproperties/app.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Product { consoleApplication: true type: "application" diff --git a/tests/auto/blackbox/testdata/productproperties/header.qbs b/tests/auto/blackbox/testdata/productproperties/header.qbs index 5c3e2db63..42f9c88d9 100644 --- a/tests/auto/blackbox/testdata/productproperties/header.qbs +++ b/tests/auto/blackbox/testdata/productproperties/header.qbs @@ -1,4 +1,3 @@ -import qbs 1.0 import qbs.TextFile Product { diff --git a/tests/auto/blackbox/testdata/productproperties/productproperties.qbs b/tests/auto/blackbox/testdata/productproperties/productproperties.qbs index 75c6224bc..79fdc34a2 100644 --- a/tests/auto/blackbox/testdata/productproperties/productproperties.qbs +++ b/tests/auto/blackbox/testdata/productproperties/productproperties.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { property string blubbProp: "5" references: ["header.qbs", "app.qbs"] diff --git a/tests/auto/blackbox/testdata/project_filepath_check/project1.qbs b/tests/auto/blackbox/testdata/project_filepath_check/project1.qbs index 5fc79d432..253992dd0 100644 --- a/tests/auto/blackbox/testdata/project_filepath_check/project1.qbs +++ b/tests/auto/blackbox/testdata/project_filepath_check/project1.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - CppApplication { files: "main.cpp" } diff --git a/tests/auto/blackbox/testdata/project_filepath_check/project2.qbs b/tests/auto/blackbox/testdata/project_filepath_check/project2.qbs index 9abdac987..8bae2dd60 100644 --- a/tests/auto/blackbox/testdata/project_filepath_check/project2.qbs +++ b/tests/auto/blackbox/testdata/project_filepath_check/project2.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - CppApplication { files: "main2.cpp" } diff --git a/tests/auto/blackbox/testdata/properties-in-export-items/properties-in-export-items.qbs b/tests/auto/blackbox/testdata/properties-in-export-items/properties-in-export-items.qbs index db9f3b2b4..a13578f95 100644 --- a/tests/auto/blackbox/testdata/properties-in-export-items/properties-in-export-items.qbs +++ b/tests/auto/blackbox/testdata/properties-in-export-items/properties-in-export-items.qbs @@ -1,5 +1,3 @@ -import qbs - Project { minimumQbsVersion: "1.6" diff --git a/tests/auto/blackbox/testdata/property-assignment-in-failed-module/modules/m/m.qbs b/tests/auto/blackbox/testdata/property-assignment-in-failed-module/modules/m/m.qbs index 38b15d807..8170c1991 100644 --- a/tests/auto/blackbox/testdata/property-assignment-in-failed-module/modules/m/m.qbs +++ b/tests/auto/blackbox/testdata/property-assignment-in-failed-module/modules/m/m.qbs @@ -1,5 +1,3 @@ -import qbs - Module { property bool doFail Depends { name: "cpp" } diff --git a/tests/auto/blackbox/testdata/property-assignment-in-failed-module/property-assignment-in-failed-module.qbs b/tests/auto/blackbox/testdata/property-assignment-in-failed-module/property-assignment-in-failed-module.qbs index 8a3a6f359..baf315bfc 100644 --- a/tests/auto/blackbox/testdata/property-assignment-in-failed-module/property-assignment-in-failed-module.qbs +++ b/tests/auto/blackbox/testdata/property-assignment-in-failed-module/property-assignment-in-failed-module.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { name: "app" Depends { name: "m"; required: false } diff --git a/tests/auto/blackbox/testdata/property-assignment-on-non-present-module/property-assignment-on-non-present-module.qbs b/tests/auto/blackbox/testdata/property-assignment-on-non-present-module/property-assignment-on-non-present-module.qbs index 4484a2542..a01d6c561 100644 --- a/tests/auto/blackbox/testdata/property-assignment-on-non-present-module/property-assignment-on-non-present-module.qbs +++ b/tests/auto/blackbox/testdata/property-assignment-on-non-present-module/property-assignment-on-non-present-module.qbs @@ -1,5 +1,3 @@ -import qbs - Product { Depends { name: "nein"; required: false } nein.doch: "ohhh!" diff --git a/tests/auto/blackbox/testdata/property-precedence/dep.qbs b/tests/auto/blackbox/testdata/property-precedence/dep.qbs index c464b7d24..9f9668ceb 100644 --- a/tests/auto/blackbox/testdata/property-precedence/dep.qbs +++ b/tests/auto/blackbox/testdata/property-precedence/dep.qbs @@ -1,5 +1,3 @@ -import qbs - Product { name: "dep" Export { diff --git a/tests/auto/blackbox/testdata/property-precedence/modules/leaf/leaf.qbs b/tests/auto/blackbox/testdata/property-precedence/modules/leaf/leaf.qbs index 741174eb2..1bfb1a1b8 100644 --- a/tests/auto/blackbox/testdata/property-precedence/modules/leaf/leaf.qbs +++ b/tests/auto/blackbox/testdata/property-precedence/modules/leaf/leaf.qbs @@ -1,5 +1,3 @@ -import qbs - Module { property string scalarProp: "leaf" property stringList listProp: ["leaf"] diff --git a/tests/auto/blackbox/testdata/property-precedence/modules/nonleaf/nonleaf.qbs b/tests/auto/blackbox/testdata/property-precedence/modules/nonleaf/nonleaf.qbs index d67b261c1..a829da09d 100644 --- a/tests/auto/blackbox/testdata/property-precedence/modules/nonleaf/nonleaf.qbs +++ b/tests/auto/blackbox/testdata/property-precedence/modules/nonleaf/nonleaf.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Depends { name: "leaf" } diff --git a/tests/auto/blackbox/testdata/property-precedence/property-precedence.qbs b/tests/auto/blackbox/testdata/property-precedence/property-precedence.qbs index 5246c8a7b..1691376e8 100644 --- a/tests/auto/blackbox/testdata/property-precedence/property-precedence.qbs +++ b/tests/auto/blackbox/testdata/property-precedence/property-precedence.qbs @@ -1,5 +1,3 @@ -import qbs - Project { references: ["dep.qbs"] Product { diff --git a/tests/auto/blackbox/testdata/propertyChanges/modules/TestModule/module.qbs b/tests/auto/blackbox/testdata/propertyChanges/modules/TestModule/module.qbs index 14cdc570e..b1e4a1fdc 100644 --- a/tests/auto/blackbox/testdata/propertyChanges/modules/TestModule/module.qbs +++ b/tests/auto/blackbox/testdata/propertyChanges/modules/TestModule/module.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.File Module { diff --git a/tests/auto/blackbox/testdata/propertyChanges/propertyChanges.qbs b/tests/auto/blackbox/testdata/propertyChanges/propertyChanges.qbs index da9a862c5..f13b1986e 100644 --- a/tests/auto/blackbox/testdata/propertyChanges/propertyChanges.qbs +++ b/tests/auto/blackbox/testdata/propertyChanges/propertyChanges.qbs @@ -1,4 +1,3 @@ -import qbs 1.0 import qbs.Environment import qbs.File import qbs.TextFile diff --git a/tests/auto/blackbox/testdata/propertyChanges/ruletest.qbs b/tests/auto/blackbox/testdata/propertyChanges/ruletest.qbs index 21d6f75ef..1d8ea961c 100644 --- a/tests/auto/blackbox/testdata/propertyChanges/ruletest.qbs +++ b/tests/auto/blackbox/testdata/propertyChanges/ruletest.qbs @@ -1,5 +1,3 @@ -import qbs - Product { name: "ruletest" type: "test-output" diff --git a/tests/auto/blackbox/testdata/pseudo-multiplexing/pseudo-multiplexing.qbs b/tests/auto/blackbox/testdata/pseudo-multiplexing/pseudo-multiplexing.qbs index 0639adc8a..88c565ba2 100644 --- a/tests/auto/blackbox/testdata/pseudo-multiplexing/pseudo-multiplexing.qbs +++ b/tests/auto/blackbox/testdata/pseudo-multiplexing/pseudo-multiplexing.qbs @@ -1,5 +1,3 @@ -import qbs - Project { Product { name: "a" diff --git a/tests/auto/blackbox/testdata/qbsVersion/qbs-version.qbs b/tests/auto/blackbox/testdata/qbsVersion/qbs-version.qbs index d7ef0d68b..ced0f3a33 100644 --- a/tests/auto/blackbox/testdata/qbsVersion/qbs-version.qbs +++ b/tests/auto/blackbox/testdata/qbsVersion/qbs-version.qbs @@ -1,5 +1,3 @@ -import qbs - Project { property string qbsVersion property int qbsVersionMajor diff --git a/tests/auto/blackbox/testdata/rad-after-incomplete-build/project_with_rule.qbs b/tests/auto/blackbox/testdata/rad-after-incomplete-build/project_with_rule.qbs index 42ec452db..ca71ab930 100644 --- a/tests/auto/blackbox/testdata/rad-after-incomplete-build/project_with_rule.qbs +++ b/tests/auto/blackbox/testdata/rad-after-incomplete-build/project_with_rule.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.TextFile Product { diff --git a/tests/auto/blackbox/testdata/recursive_renaming/recursive_renaming.qbs b/tests/auto/blackbox/testdata/recursive_renaming/recursive_renaming.qbs index 0ed6fa72f..b49e9c53f 100644 --- a/tests/auto/blackbox/testdata/recursive_renaming/recursive_renaming.qbs +++ b/tests/auto/blackbox/testdata/recursive_renaming/recursive_renaming.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Product { qbs.installPrefix: "" Group { diff --git a/tests/auto/blackbox/testdata/recursive_wildcards/recursive_wildcards.qbs b/tests/auto/blackbox/testdata/recursive_wildcards/recursive_wildcards.qbs index dc993ae23..4e9da01d3 100644 --- a/tests/auto/blackbox/testdata/recursive_wildcards/recursive_wildcards.qbs +++ b/tests/auto/blackbox/testdata/recursive_wildcards/recursive_wildcards.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.TextFile Product { diff --git a/tests/auto/blackbox/testdata/referenceErrorInExport/referenceErrorInExport.qbs b/tests/auto/blackbox/testdata/referenceErrorInExport/referenceErrorInExport.qbs index 91069f629..d64244f0f 100644 --- a/tests/auto/blackbox/testdata/referenceErrorInExport/referenceErrorInExport.qbs +++ b/tests/auto/blackbox/testdata/referenceErrorInExport/referenceErrorInExport.qbs @@ -1,5 +1,3 @@ -import qbs - Project { CppApplication { Depends { name: "other" } diff --git a/tests/auto/blackbox/testdata/renameDependency/before/renameDependency.qbs b/tests/auto/blackbox/testdata/renameDependency/before/renameDependency.qbs index e6f3cf66b..d42a760dd 100644 --- a/tests/auto/blackbox/testdata/renameDependency/before/renameDependency.qbs +++ b/tests/auto/blackbox/testdata/renameDependency/before/renameDependency.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { files: ["*.cpp", "*.h"] } diff --git a/tests/auto/blackbox/testdata/reproducible-build/reproducible-build.qbs b/tests/auto/blackbox/testdata/reproducible-build/reproducible-build.qbs index ebf2ba639..f7ed8e61a 100644 --- a/tests/auto/blackbox/testdata/reproducible-build/reproducible-build.qbs +++ b/tests/auto/blackbox/testdata/reproducible-build/reproducible-build.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { name: "the product" files: ["file1.cpp", "file2.cpp", "main.cpp"] diff --git a/tests/auto/blackbox/testdata/require-deprecated/require.qbs b/tests/auto/blackbox/testdata/require-deprecated/require.qbs index d30a15805..87d8b054b 100644 --- a/tests/auto/blackbox/testdata/require-deprecated/require.qbs +++ b/tests/auto/blackbox/testdata/require-deprecated/require.qbs @@ -1,4 +1,3 @@ -import qbs 1.0 import 'blubb.js' as blubb Product { diff --git a/tests/auto/blackbox/testdata/require/require.qbs b/tests/auto/blackbox/testdata/require/require.qbs index d30a15805..87d8b054b 100644 --- a/tests/auto/blackbox/testdata/require/require.qbs +++ b/tests/auto/blackbox/testdata/require/require.qbs @@ -1,4 +1,3 @@ -import qbs 1.0 import 'blubb.js' as blubb Product { diff --git a/tests/auto/blackbox/testdata/rescue-transformer-data/modules/m/m.qbs b/tests/auto/blackbox/testdata/rescue-transformer-data/modules/m/m.qbs index 03fdf7a6b..640d2c3b3 100644 --- a/tests/auto/blackbox/testdata/rescue-transformer-data/modules/m/m.qbs +++ b/tests/auto/blackbox/testdata/rescue-transformer-data/modules/m/m.qbs @@ -1,5 +1,3 @@ -import qbs - Module { property bool p diff --git a/tests/auto/blackbox/testdata/rescue-transformer-data/transformer-data-rescue.qbs b/tests/auto/blackbox/testdata/rescue-transformer-data/transformer-data-rescue.qbs index 2eafcc01d..4d266bbd4 100644 --- a/tests/auto/blackbox/testdata/rescue-transformer-data/transformer-data-rescue.qbs +++ b/tests/auto/blackbox/testdata/rescue-transformer-data/transformer-data-rescue.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { type: base.concat(["out"]) Depends { name: "m" } diff --git a/tests/auto/blackbox/testdata/response-files/response-files.qbs b/tests/auto/blackbox/testdata/response-files/response-files.qbs index 1e1e75314..fbb6f0518 100644 --- a/tests/auto/blackbox/testdata/response-files/response-files.qbs +++ b/tests/auto/blackbox/testdata/response-files/response-files.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.FileInfo import qbs.TextFile diff --git a/tests/auto/blackbox/testdata/rule-with-no-inputs/rule-with-no-inputs.qbs b/tests/auto/blackbox/testdata/rule-with-no-inputs/rule-with-no-inputs.qbs index 6e2bf4430..9c0f01217 100644 --- a/tests/auto/blackbox/testdata/rule-with-no-inputs/rule-with-no-inputs.qbs +++ b/tests/auto/blackbox/testdata/rule-with-no-inputs/rule-with-no-inputs.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.TextFile Product { diff --git a/tests/auto/blackbox/testdata/rule-with-non-required-inputs/rule-with-non-required-inputs.qbs b/tests/auto/blackbox/testdata/rule-with-non-required-inputs/rule-with-non-required-inputs.qbs index 6719bc69d..1bd9beebf 100644 --- a/tests/auto/blackbox/testdata/rule-with-non-required-inputs/rule-with-non-required-inputs.qbs +++ b/tests/auto/blackbox/testdata/rule-with-non-required-inputs/rule-with-non-required-inputs.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.TextFile Product { diff --git a/tests/auto/blackbox/testdata/ruleConditions/modules/narfzort/narfzort.qbs b/tests/auto/blackbox/testdata/ruleConditions/modules/narfzort/narfzort.qbs index 187367388..0044537cb 100644 --- a/tests/auto/blackbox/testdata/ruleConditions/modules/narfzort/narfzort.qbs +++ b/tests/auto/blackbox/testdata/ruleConditions/modules/narfzort/narfzort.qbs @@ -1,4 +1,3 @@ -import qbs 1.0 import qbs.FileInfo import qbs.TextFile diff --git a/tests/auto/blackbox/testdata/ruleConditions/ruleConditions.qbs b/tests/auto/blackbox/testdata/ruleConditions/ruleConditions.qbs index 766bf3c5d..a8f7ffad2 100644 --- a/tests/auto/blackbox/testdata/ruleConditions/ruleConditions.qbs +++ b/tests/auto/blackbox/testdata/ruleConditions/ruleConditions.qbs @@ -1,4 +1,3 @@ -import qbs 1.0 import "templates/zorduct.qbs" as Zorduct Project { diff --git a/tests/auto/blackbox/testdata/ruleConditions/templates/zorduct.qbs b/tests/auto/blackbox/testdata/ruleConditions/templates/zorduct.qbs index 8f19a5a6d..cddad8c30 100644 --- a/tests/auto/blackbox/testdata/ruleConditions/templates/zorduct.qbs +++ b/tests/auto/blackbox/testdata/ruleConditions/templates/zorduct.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Product { type: ["application", "zort"] consoleApplication: true diff --git a/tests/auto/blackbox/testdata/ruleCycle/ruleCycle.qbs b/tests/auto/blackbox/testdata/ruleCycle/ruleCycle.qbs index 6898afeac..1c5d61d95 100644 --- a/tests/auto/blackbox/testdata/ruleCycle/ruleCycle.qbs +++ b/tests/auto/blackbox/testdata/ruleCycle/ruleCycle.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { Product { name: "the cycle of life" diff --git a/tests/auto/blackbox/testdata/separate-debug-info/separate-debug-info.qbs b/tests/auto/blackbox/testdata/separate-debug-info/separate-debug-info.qbs index b28d7b822..48bdff904 100644 --- a/tests/auto/blackbox/testdata/separate-debug-info/separate-debug-info.qbs +++ b/tests/auto/blackbox/testdata/separate-debug-info/separate-debug-info.qbs @@ -1,5 +1,3 @@ -import qbs - Project { CppApplication { name: "app1" diff --git a/tests/auto/blackbox/testdata/setup-build-environment/modules/buildenv/buildenv.qbs b/tests/auto/blackbox/testdata/setup-build-environment/modules/buildenv/buildenv.qbs index 9beb22393..9213c6469 100644 --- a/tests/auto/blackbox/testdata/setup-build-environment/modules/buildenv/buildenv.qbs +++ b/tests/auto/blackbox/testdata/setup-build-environment/modules/buildenv/buildenv.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Environment Module { diff --git a/tests/auto/blackbox/testdata/setup-build-environment/modules/m/m.qbs b/tests/auto/blackbox/testdata/setup-build-environment/modules/m/m.qbs index 81cf47bcd..74e718c50 100644 --- a/tests/auto/blackbox/testdata/setup-build-environment/modules/m/m.qbs +++ b/tests/auto/blackbox/testdata/setup-build-environment/modules/m/m.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Environment import qbs.TextFile diff --git a/tests/auto/blackbox/testdata/setup-build-environment/setup-build-environment.qbs b/tests/auto/blackbox/testdata/setup-build-environment/setup-build-environment.qbs index 3248815f0..c5a7e87e0 100644 --- a/tests/auto/blackbox/testdata/setup-build-environment/setup-build-environment.qbs +++ b/tests/auto/blackbox/testdata/setup-build-environment/setup-build-environment.qbs @@ -1,5 +1,3 @@ -import qbs - Project { Product { name: "first_product" diff --git a/tests/auto/blackbox/testdata/setup-run-environment/setup-run-environment.qbs b/tests/auto/blackbox/testdata/setup-run-environment/setup-run-environment.qbs index 8a5312d75..b5ac8b289 100644 --- a/tests/auto/blackbox/testdata/setup-run-environment/setup-run-environment.qbs +++ b/tests/auto/blackbox/testdata/setup-run-environment/setup-run-environment.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.FileInfo Project { diff --git a/tests/auto/blackbox/testdata/smart-relinking/smart-relinking.qbs b/tests/auto/blackbox/testdata/smart-relinking/smart-relinking.qbs index 44d8013b9..aac0692a8 100644 --- a/tests/auto/blackbox/testdata/smart-relinking/smart-relinking.qbs +++ b/tests/auto/blackbox/testdata/smart-relinking/smart-relinking.qbs @@ -1,5 +1,3 @@ -import qbs - Project { minimumQbsVersion: "1.6" Probe { diff --git a/tests/auto/blackbox/testdata/source-artifact-in-inputs-from-dependencies/source-artifact-in-inputs-from-dependencies.qbs b/tests/auto/blackbox/testdata/source-artifact-in-inputs-from-dependencies/source-artifact-in-inputs-from-dependencies.qbs index ef038a687..3486667f9 100644 --- a/tests/auto/blackbox/testdata/source-artifact-in-inputs-from-dependencies/source-artifact-in-inputs-from-dependencies.qbs +++ b/tests/auto/blackbox/testdata/source-artifact-in-inputs-from-dependencies/source-artifact-in-inputs-from-dependencies.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.FileInfo import qbs.TextFile diff --git a/tests/auto/blackbox/testdata/soversion/soversion.qbs b/tests/auto/blackbox/testdata/soversion/soversion.qbs index d024c25b9..6ce2144c0 100644 --- a/tests/auto/blackbox/testdata/soversion/soversion.qbs +++ b/tests/auto/blackbox/testdata/soversion/soversion.qbs @@ -1,5 +1,3 @@ -import qbs - DynamicLibrary { name: "mylib" property bool useVersion diff --git a/tests/auto/blackbox/testdata/static-lib-without-sources/static-lib-without-sources.qbs b/tests/auto/blackbox/testdata/static-lib-without-sources/static-lib-without-sources.qbs index 6109b428c..32a58c94b 100644 --- a/tests/auto/blackbox/testdata/static-lib-without-sources/static-lib-without-sources.qbs +++ b/tests/auto/blackbox/testdata/static-lib-without-sources/static-lib-without-sources.qbs @@ -1,5 +1,3 @@ -import qbs - Project { StaticLibrary { name: "a" diff --git a/tests/auto/blackbox/testdata/subprofile-change-tracking/subprofile-change-tracking.qbs b/tests/auto/blackbox/testdata/subprofile-change-tracking/subprofile-change-tracking.qbs index b3fba23fe..8abd12869 100644 --- a/tests/auto/blackbox/testdata/subprofile-change-tracking/subprofile-change-tracking.qbs +++ b/tests/auto/blackbox/testdata/subprofile-change-tracking/subprofile-change-tracking.qbs @@ -1,5 +1,3 @@ -import qbs - Project { CppApplication { name: "app1"; files: ["main1.cpp"] } CppApplication { diff --git a/tests/auto/blackbox/testdata/successive-changes/successive-changes.qbs b/tests/auto/blackbox/testdata/successive-changes/successive-changes.qbs index f42ca4096..77df81e39 100644 --- a/tests/auto/blackbox/testdata/successive-changes/successive-changes.qbs +++ b/tests/auto/blackbox/testdata/successive-changes/successive-changes.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.TextFile Project { diff --git a/tests/auto/blackbox/testdata/suspicious-calls/copy-command.qbs b/tests/auto/blackbox/testdata/suspicious-calls/copy-command.qbs index f913a8efb..3d43ef1f5 100644 --- a/tests/auto/blackbox/testdata/suspicious-calls/copy-command.qbs +++ b/tests/auto/blackbox/testdata/suspicious-calls/copy-command.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.File Product { diff --git a/tests/auto/blackbox/testdata/suspicious-calls/copy-eval.qbs b/tests/auto/blackbox/testdata/suspicious-calls/copy-eval.qbs index 93bfca81d..b074c00cf 100644 --- a/tests/auto/blackbox/testdata/suspicious-calls/copy-eval.qbs +++ b/tests/auto/blackbox/testdata/suspicious-calls/copy-eval.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.File Product { diff --git a/tests/auto/blackbox/testdata/suspicious-calls/copy-prepare.qbs b/tests/auto/blackbox/testdata/suspicious-calls/copy-prepare.qbs index b3d402062..0408c9d5a 100644 --- a/tests/auto/blackbox/testdata/suspicious-calls/copy-prepare.qbs +++ b/tests/auto/blackbox/testdata/suspicious-calls/copy-prepare.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.File Product { diff --git a/tests/auto/blackbox/testdata/suspicious-calls/copy-probe.qbs b/tests/auto/blackbox/testdata/suspicious-calls/copy-probe.qbs index dd97839c2..f47b204d5 100644 --- a/tests/auto/blackbox/testdata/suspicious-calls/copy-probe.qbs +++ b/tests/auto/blackbox/testdata/suspicious-calls/copy-probe.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.File Product { diff --git a/tests/auto/blackbox/testdata/suspicious-calls/direntries-command.qbs b/tests/auto/blackbox/testdata/suspicious-calls/direntries-command.qbs index bb96aa1dc..c20d6f2ef 100644 --- a/tests/auto/blackbox/testdata/suspicious-calls/direntries-command.qbs +++ b/tests/auto/blackbox/testdata/suspicious-calls/direntries-command.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.File Product { diff --git a/tests/auto/blackbox/testdata/suspicious-calls/direntries-eval.qbs b/tests/auto/blackbox/testdata/suspicious-calls/direntries-eval.qbs index 4cd0d634e..2a759d93a 100644 --- a/tests/auto/blackbox/testdata/suspicious-calls/direntries-eval.qbs +++ b/tests/auto/blackbox/testdata/suspicious-calls/direntries-eval.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.File Product { diff --git a/tests/auto/blackbox/testdata/suspicious-calls/direntries-prepare.qbs b/tests/auto/blackbox/testdata/suspicious-calls/direntries-prepare.qbs index bc439125e..7b39a8969 100644 --- a/tests/auto/blackbox/testdata/suspicious-calls/direntries-prepare.qbs +++ b/tests/auto/blackbox/testdata/suspicious-calls/direntries-prepare.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.File Product { diff --git a/tests/auto/blackbox/testdata/suspicious-calls/direntries-probe.qbs b/tests/auto/blackbox/testdata/suspicious-calls/direntries-probe.qbs index d2c8b8ded..fff82df81 100644 --- a/tests/auto/blackbox/testdata/suspicious-calls/direntries-probe.qbs +++ b/tests/auto/blackbox/testdata/suspicious-calls/direntries-probe.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.File Product { diff --git a/tests/auto/blackbox/testdata/symbolLinkMode/symbolLinkMode.qbs b/tests/auto/blackbox/testdata/symbolLinkMode/symbolLinkMode.qbs index 127d459c8..b2df70033 100644 --- a/tests/auto/blackbox/testdata/symbolLinkMode/symbolLinkMode.qbs +++ b/tests/auto/blackbox/testdata/symbolLinkMode/symbolLinkMode.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.FileInfo Project { diff --git a/tests/auto/blackbox/testdata/symlink-removal/symlink-removal.qbs b/tests/auto/blackbox/testdata/symlink-removal/symlink-removal.qbs index a2f450082..4aa36142d 100644 --- a/tests/auto/blackbox/testdata/symlink-removal/symlink-removal.qbs +++ b/tests/auto/blackbox/testdata/symlink-removal/symlink-removal.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.File Product { diff --git a/tests/auto/blackbox/testdata/system-include-paths/system-include-paths.qbs b/tests/auto/blackbox/testdata/system-include-paths/system-include-paths.qbs index 081d40202..9c644fc2a 100644 --- a/tests/auto/blackbox/testdata/system-include-paths/system-include-paths.qbs +++ b/tests/auto/blackbox/testdata/system-include-paths/system-include-paths.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { files: ["main.cpp"] cpp.systemIncludePaths: ["subdir"] diff --git a/tests/auto/blackbox/testdata/system-run-paths/system-run-paths.qbs b/tests/auto/blackbox/testdata/system-run-paths/system-run-paths.qbs index 7f9fa3000..6e2137173 100644 --- a/tests/auto/blackbox/testdata/system-run-paths/system-run-paths.qbs +++ b/tests/auto/blackbox/testdata/system-run-paths/system-run-paths.qbs @@ -1,5 +1,3 @@ -import qbs - Project { property bool setRunPaths Product { diff --git a/tests/auto/blackbox/testdata/texttemplate/texttemplatetest.qbs b/tests/auto/blackbox/testdata/texttemplate/texttemplatetest.qbs index 8b312e7c6..6abda64f9 100644 --- a/tests/auto/blackbox/testdata/texttemplate/texttemplatetest.qbs +++ b/tests/auto/blackbox/testdata/texttemplate/texttemplatetest.qbs @@ -1,5 +1,3 @@ -import qbs - Product { name: "one" type: ["text"] diff --git a/tests/auto/blackbox/testdata/toplevel-searchpath/qbs-resources/imports/MyProduct.qbs b/tests/auto/blackbox/testdata/toplevel-searchpath/qbs-resources/imports/MyProduct.qbs index 6d16a3c53..86718b571 100644 --- a/tests/auto/blackbox/testdata/toplevel-searchpath/qbs-resources/imports/MyProduct.qbs +++ b/tests/auto/blackbox/testdata/toplevel-searchpath/qbs-resources/imports/MyProduct.qbs @@ -1,3 +1 @@ -import qbs - Product { } diff --git a/tests/auto/blackbox/testdata/toplevel-searchpath/toplevel-searchpath.qbs b/tests/auto/blackbox/testdata/toplevel-searchpath/toplevel-searchpath.qbs index 2dd54a81f..8ca6cfca9 100644 --- a/tests/auto/blackbox/testdata/toplevel-searchpath/toplevel-searchpath.qbs +++ b/tests/auto/blackbox/testdata/toplevel-searchpath/toplevel-searchpath.qbs @@ -1,3 +1 @@ -import qbs - MyProduct { } diff --git a/tests/auto/blackbox/testdata/trackAddFile/after/trackAddFile.qbs b/tests/auto/blackbox/testdata/trackAddFile/after/trackAddFile.qbs index 469aff097..f4b9ba21f 100644 --- a/tests/auto/blackbox/testdata/trackAddFile/after/trackAddFile.qbs +++ b/tests/auto/blackbox/testdata/trackAddFile/after/trackAddFile.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { Product { name: 'someapp' diff --git a/tests/auto/blackbox/testdata/trackAddFile/before/trackAddFile.qbs b/tests/auto/blackbox/testdata/trackAddFile/before/trackAddFile.qbs index fc647cdbe..bb0ab7d44 100644 --- a/tests/auto/blackbox/testdata/trackAddFile/before/trackAddFile.qbs +++ b/tests/auto/blackbox/testdata/trackAddFile/before/trackAddFile.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { Product { name: 'someapp' diff --git a/tests/auto/blackbox/testdata/trackExternalProductChanges/trackExternalProductChanges.qbs b/tests/auto/blackbox/testdata/trackExternalProductChanges/trackExternalProductChanges.qbs index 232c8ea41..534f49ff2 100644 --- a/tests/auto/blackbox/testdata/trackExternalProductChanges/trackExternalProductChanges.qbs +++ b/tests/auto/blackbox/testdata/trackExternalProductChanges/trackExternalProductChanges.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Environment import "fileList.js" as FileList diff --git a/tests/auto/blackbox/testdata/trackFileTags/after/trackFileTags.qbs b/tests/auto/blackbox/testdata/trackFileTags/after/trackFileTags.qbs index c0e5c4715..869ce238b 100644 --- a/tests/auto/blackbox/testdata/trackFileTags/after/trackFileTags.qbs +++ b/tests/auto/blackbox/testdata/trackFileTags/after/trackFileTags.qbs @@ -1,4 +1,3 @@ -import qbs 1.0 import qbs.TextFile Project { diff --git a/tests/auto/blackbox/testdata/trackFileTags/before/trackFileTags.qbs b/tests/auto/blackbox/testdata/trackFileTags/before/trackFileTags.qbs index 7ac895c5f..ebe31bf26 100644 --- a/tests/auto/blackbox/testdata/trackFileTags/before/trackFileTags.qbs +++ b/tests/auto/blackbox/testdata/trackFileTags/before/trackFileTags.qbs @@ -1,4 +1,3 @@ -import qbs 1.0 import qbs.TextFile Project { diff --git a/tests/auto/blackbox/testdata/trackProducts/after/product3.qbs b/tests/auto/blackbox/testdata/trackProducts/after/product3.qbs index 4dac755c0..bd9cdc009 100644 --- a/tests/auto/blackbox/testdata/trackProducts/after/product3.qbs +++ b/tests/auto/blackbox/testdata/trackProducts/after/product3.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Product { Depends { name: "cpp" } type: "application" diff --git a/tests/auto/blackbox/testdata/trackProducts/after/trackProducts.qbs b/tests/auto/blackbox/testdata/trackProducts/after/trackProducts.qbs index 343405c08..2935ed1df 100644 --- a/tests/auto/blackbox/testdata/trackProducts/after/trackProducts.qbs +++ b/tests/auto/blackbox/testdata/trackProducts/after/trackProducts.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { name: "trackProducts" diff --git a/tests/auto/blackbox/testdata/trackProducts/before/product1.qbs b/tests/auto/blackbox/testdata/trackProducts/before/product1.qbs index 60e8b0924..48176c809 100644 --- a/tests/auto/blackbox/testdata/trackProducts/before/product1.qbs +++ b/tests/auto/blackbox/testdata/trackProducts/before/product1.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Product { Depends { name: "cpp" } type: "application" diff --git a/tests/auto/blackbox/testdata/trackProducts/before/product2.qbs b/tests/auto/blackbox/testdata/trackProducts/before/product2.qbs index 5490b8844..be250486d 100644 --- a/tests/auto/blackbox/testdata/trackProducts/before/product2.qbs +++ b/tests/auto/blackbox/testdata/trackProducts/before/product2.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Product { Depends { name: "cpp" } type: "application" diff --git a/tests/auto/blackbox/testdata/trackProducts/before/trackProducts.qbs b/tests/auto/blackbox/testdata/trackProducts/before/trackProducts.qbs index 6d5555c68..8b5edb6bf 100644 --- a/tests/auto/blackbox/testdata/trackProducts/before/trackProducts.qbs +++ b/tests/auto/blackbox/testdata/trackProducts/before/trackProducts.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { name: "trackProducts" diff --git a/tests/auto/blackbox/testdata/transitive-optional-dependencies/modules/a/a.qbs b/tests/auto/blackbox/testdata/transitive-optional-dependencies/modules/a/a.qbs index adec14e41..ffe7ef70a 100644 --- a/tests/auto/blackbox/testdata/transitive-optional-dependencies/modules/a/a.qbs +++ b/tests/auto/blackbox/testdata/transitive-optional-dependencies/modules/a/a.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Depends { name: "b"; required: false } } diff --git a/tests/auto/blackbox/testdata/transitive-optional-dependencies/modules/b/b.qbs b/tests/auto/blackbox/testdata/transitive-optional-dependencies/modules/b/b.qbs index fb38b600a..ba08b862b 100644 --- a/tests/auto/blackbox/testdata/transitive-optional-dependencies/modules/b/b.qbs +++ b/tests/auto/blackbox/testdata/transitive-optional-dependencies/modules/b/b.qbs @@ -1,5 +1,3 @@ -import qbs - Module { condition: false } diff --git a/tests/auto/blackbox/testdata/transitive-optional-dependencies/transitive-optional-dependencies.qbs b/tests/auto/blackbox/testdata/transitive-optional-dependencies/transitive-optional-dependencies.qbs index 08860b057..6171fa94f 100644 --- a/tests/auto/blackbox/testdata/transitive-optional-dependencies/transitive-optional-dependencies.qbs +++ b/tests/auto/blackbox/testdata/transitive-optional-dependencies/transitive-optional-dependencies.qbs @@ -1,5 +1,3 @@ -import qbs - Product { Depends { name: "a" } } diff --git a/tests/auto/blackbox/testdata/typescript/typescript.qbs b/tests/auto/blackbox/testdata/typescript/typescript.qbs index b6604830f..28c62eb45 100644 --- a/tests/auto/blackbox/testdata/typescript/typescript.qbs +++ b/tests/auto/blackbox/testdata/typescript/typescript.qbs @@ -1,5 +1,3 @@ -import qbs - Project { NodeJSApplication { Depends { name: "typescript" } diff --git a/tests/auto/blackbox/testdata/usings-as-sole-inputs-non-multiplexed/usings-as-sole-inputs-non-multiplexed.qbs b/tests/auto/blackbox/testdata/usings-as-sole-inputs-non-multiplexed/usings-as-sole-inputs-non-multiplexed.qbs index 7d4087620..cd2d23895 100644 --- a/tests/auto/blackbox/testdata/usings-as-sole-inputs-non-multiplexed/usings-as-sole-inputs-non-multiplexed.qbs +++ b/tests/auto/blackbox/testdata/usings-as-sole-inputs-non-multiplexed/usings-as-sole-inputs-non-multiplexed.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.FileInfo import qbs.TextFile diff --git a/tests/auto/blackbox/testdata/variant-suffix/variant-suffix.qbs b/tests/auto/blackbox/testdata/variant-suffix/variant-suffix.qbs index a1dff378e..b6e025e4c 100644 --- a/tests/auto/blackbox/testdata/variant-suffix/variant-suffix.qbs +++ b/tests/auto/blackbox/testdata/variant-suffix/variant-suffix.qbs @@ -1,5 +1,3 @@ -import qbs - StaticLibrary { name: "l" diff --git a/tests/auto/blackbox/testdata/vcs/vcstest.qbs b/tests/auto/blackbox/testdata/vcs/vcstest.qbs index 11d001743..5d359e2c7 100644 --- a/tests/auto/blackbox/testdata/vcs/vcstest.qbs +++ b/tests/auto/blackbox/testdata/vcs/vcstest.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { Depends { name: "vcs" } vcs.headerFileName: "my-repo-state.h" diff --git a/tests/auto/blackbox/testdata/versioncheck/modules/higher/higher.qbs b/tests/auto/blackbox/testdata/versioncheck/modules/higher/higher.qbs index 4a9c85ceb..c5ab20f58 100644 --- a/tests/auto/blackbox/testdata/versioncheck/modules/higher/higher.qbs +++ b/tests/auto/blackbox/testdata/versioncheck/modules/higher/higher.qbs @@ -1,5 +1,3 @@ -import qbs - Module { Depends { name: "lower" diff --git a/tests/auto/blackbox/testdata/versioncheck/modules/lower/lower.qbs b/tests/auto/blackbox/testdata/versioncheck/modules/lower/lower.qbs index 9322b53b1..cd8c6471d 100644 --- a/tests/auto/blackbox/testdata/versioncheck/modules/lower/lower.qbs +++ b/tests/auto/blackbox/testdata/versioncheck/modules/lower/lower.qbs @@ -1,3 +1 @@ -import qbs - Module { } diff --git a/tests/auto/blackbox/testdata/versioncheck/versioncheck.qbs b/tests/auto/blackbox/testdata/versioncheck/versioncheck.qbs index 8214428f1..63bef1d75 100644 --- a/tests/auto/blackbox/testdata/versioncheck/versioncheck.qbs +++ b/tests/auto/blackbox/testdata/versioncheck/versioncheck.qbs @@ -1,5 +1,3 @@ -import qbs - Product { property string requestedMinVersion property string requestedMaxVersion diff --git a/tests/auto/blackbox/testdata/versionscript/versionscript.qbs b/tests/auto/blackbox/testdata/versionscript/versionscript.qbs index 5af798f5f..cc5c7b1cc 100644 --- a/tests/auto/blackbox/testdata/versionscript/versionscript.qbs +++ b/tests/auto/blackbox/testdata/versionscript/versionscript.qbs @@ -1,5 +1,3 @@ -import qbs - DynamicLibrary { type: base.concat("custom") Depends { name: "cpp" } diff --git a/tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs b/tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs index 4ab93af28..f3bcff2cd 100644 --- a/tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs +++ b/tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Utilities Project { diff --git a/tests/auto/blackbox/testdata/wildcard_renaming/wildcard_renaming.qbs b/tests/auto/blackbox/testdata/wildcard_renaming/wildcard_renaming.qbs index 68043f991..124161880 100644 --- a/tests/auto/blackbox/testdata/wildcard_renaming/wildcard_renaming.qbs +++ b/tests/auto/blackbox/testdata/wildcard_renaming/wildcard_renaming.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Product { qbs.installPrefix: "" Group { diff --git a/tests/auto/blackbox/testdata/wildcards-and-rules/wildcards-and-rules.qbs b/tests/auto/blackbox/testdata/wildcards-and-rules/wildcards-and-rules.qbs index 88fadd3a5..f6662529d 100644 --- a/tests/auto/blackbox/testdata/wildcards-and-rules/wildcards-and-rules.qbs +++ b/tests/auto/blackbox/testdata/wildcards-and-rules/wildcards-and-rules.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.TextFile Product { diff --git a/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs b/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs index eabb6da1e..07f61ba2c 100644 --- a/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs +++ b/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.FileInfo Project { diff --git a/tests/auto/blackbox/testdata/wixDependencies/wixDependencies.qbs b/tests/auto/blackbox/testdata/wixDependencies/wixDependencies.qbs index 92724e25c..d42a18054 100644 --- a/tests/auto/blackbox/testdata/wixDependencies/wixDependencies.qbs +++ b/tests/auto/blackbox/testdata/wixDependencies/wixDependencies.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.TextFile Project { diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 199ad74d3..5e9615a17 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -2212,7 +2212,7 @@ void TestBlackbox::referenceErrorInExport() params.expectFailure = true; QVERIFY(runQbs(params) != 0); QVERIFY(m_qbsStderr.contains( - "referenceErrorInExport.qbs:17:12 ReferenceError: Can't find variable: includePaths")); + "referenceErrorInExport.qbs:15:12 ReferenceError: Can't find variable: includePaths")); } void TestBlackbox::reproducibleBuild() @@ -3197,25 +3197,25 @@ void TestBlackbox::errorInfo() QCOMPARE(runQbs(resolveParams), 0); buildParams.arguments = resolveParams.arguments; QVERIFY(runQbs(buildParams) != 0); - QVERIFY2(m_qbsStderr.contains("error-info.qbs:25"), m_qbsStderr); + QVERIFY2(m_qbsStderr.contains("error-info.qbs:24"), m_qbsStderr); resolveParams.arguments = QStringList() << "project.fail2:true"; QCOMPARE(runQbs(resolveParams), 0); buildParams.arguments = resolveParams.arguments; QVERIFY(runQbs(buildParams) != 0); - QVERIFY2(m_qbsStderr.contains("error-info.qbs:37"), m_qbsStderr); + QVERIFY2(m_qbsStderr.contains("error-info.qbs:36"), m_qbsStderr); resolveParams.arguments = QStringList() << "project.fail3:true"; QCOMPARE(runQbs(resolveParams), 0); buildParams.arguments = resolveParams.arguments; QVERIFY(runQbs(buildParams) != 0); - QVERIFY2(m_qbsStderr.contains("error-info.qbs:52"), m_qbsStderr); + QVERIFY2(m_qbsStderr.contains("error-info.qbs:51"), m_qbsStderr); resolveParams.arguments = QStringList() << "project.fail4:true"; QCOMPARE(runQbs(resolveParams), 0); buildParams.arguments = resolveParams.arguments; QVERIFY(runQbs(buildParams) != 0); - QVERIFY2(m_qbsStderr.contains("error-info.qbs:67"), m_qbsStderr); + QVERIFY2(m_qbsStderr.contains("error-info.qbs:66"), m_qbsStderr); resolveParams.arguments = QStringList() << "project.fail5:true"; QCOMPARE(runQbs(resolveParams), 0); @@ -3234,7 +3234,7 @@ void TestBlackbox::errorInfo() buildParams.arguments = resolveParams.arguments; QVERIFY(runQbs(buildParams) != 0); QVERIFY2(m_qbsStderr.contains("JavaScriptCommand.sourceCode"), m_qbsStderr); - QVERIFY2(m_qbsStderr.contains("error-info.qbs:58"), m_qbsStderr); + QVERIFY2(m_qbsStderr.contains("error-info.qbs:57"), m_qbsStderr); } void TestBlackbox::escapedLinkerFlags() @@ -3698,7 +3698,7 @@ void TestBlackbox::invalidExtensionInstantiation() params.expectFailure = true; params.arguments << (QString("products.theProduct.extension:") + QTest::currentDataTag()); QVERIFY(runQbs(params) != 0); - QVERIFY2(m_qbsStderr.contains("invalid-extension-instantiation.qbs:18") + QVERIFY2(m_qbsStderr.contains("invalid-extension-instantiation.qbs:17") && m_qbsStderr.contains('\'' + QByteArray(QTest::currentDataTag()) + "' cannot be instantiated"), m_qbsStderr.constData()); 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); } |