diff options
Diffstat (limited to 'tests/auto')
44 files changed, 13 insertions, 74 deletions
diff --git a/tests/auto/api/api.qbs b/tests/auto/api/api.qbs index 21ff86a90..10064c888 100644 --- a/tests/auto/api/api.qbs +++ b/tests/auto/api/api.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Utilities QbsAutotest { diff --git a/tests/auto/api/testdata/dependency-on-multiplexed-type/dependency-on-multiplexed-type.qbs b/tests/auto/api/testdata/dependency-on-multiplexed-type/dependency-on-multiplexed-type.qbs index cfc2769d2..f0ffebe39 100644 --- a/tests/auto/api/testdata/dependency-on-multiplexed-type/dependency-on-multiplexed-type.qbs +++ b/tests/auto/api/testdata/dependency-on-multiplexed-type/dependency-on-multiplexed-type.qbs @@ -1,5 +1,3 @@ -import qbs - Project { Product { name: "dep"; type: "x" } Product { diff --git a/tests/auto/api/testdata/qt5-plugin/qt5-plugin.qbs b/tests/auto/api/testdata/qt5-plugin/qt5-plugin.qbs index 204711625..d50072ad8 100644 --- a/tests/auto/api/testdata/qt5-plugin/qt5-plugin.qbs +++ b/tests/auto/api/testdata/qt5-plugin/qt5-plugin.qbs @@ -1,4 +1,3 @@ -import qbs.base import qbs.File import qbs.FileInfo diff --git a/tests/auto/api/tst_api.cpp b/tests/auto/api/tst_api.cpp index ac37139a3..99b5059a0 100644 --- a/tests/auto/api/tst_api.cpp +++ b/tests/auto/api/tst_api.cpp @@ -2975,7 +2975,7 @@ void TestApi::trackAddQObjectHeader() = defaultSetupParameters("missing-qobject-header/missingheader.qbs"); QFile qbsFile(params.projectFilePath()); QVERIFY(qbsFile.open(QIODevice::WriteOnly | QIODevice::Truncate)); - qbsFile.write("import qbs.base 1.0\nCppApplication {\n Depends { name: 'Qt.core' }\n" + qbsFile.write("CppApplication {\n Depends { name: 'Qt.core' }\n" " files: ['main.cpp', 'myobject.cpp']\n}"); qbsFile.close(); ProcessResultReceiver receiver; @@ -2986,7 +2986,7 @@ void TestApi::trackAddQObjectHeader() WAIT_FOR_NEW_TIMESTAMP(); QVERIFY(qbsFile.open(QIODevice::WriteOnly | QIODevice::Truncate)); - qbsFile.write("import qbs.base 1.0\nCppApplication {\n Depends { name: 'Qt.core' }\n" + qbsFile.write("CppApplication {\n Depends { name: 'Qt.core' }\n" " files: ['main.cpp', 'myobject.cpp','myobject.h']\n}"); qbsFile.close(); errorInfo = doBuildProject("missing-qobject-header/missingheader.qbs"); @@ -3000,7 +3000,7 @@ void TestApi::trackRemoveQObjectHeader() removeBuildDir(params); QFile qbsFile(params.projectFilePath()); QVERIFY(qbsFile.open(QIODevice::WriteOnly | QIODevice::Truncate)); - qbsFile.write("import qbs.base 1.0\nCppApplication {\n Depends { name: 'Qt.core' }\n" + qbsFile.write("CppApplication {\n Depends { name: 'Qt.core' }\n" " files: ['main.cpp', 'myobject.cpp','myobject.h']\n}"); qbsFile.close(); qbs::ErrorInfo errorInfo = doBuildProject("missing-qobject-header/missingheader.qbs"); @@ -3008,7 +3008,7 @@ void TestApi::trackRemoveQObjectHeader() WAIT_FOR_NEW_TIMESTAMP(); QVERIFY(qbsFile.open(QIODevice::WriteOnly | QIODevice::Truncate)); - qbsFile.write("import qbs.base 1.0\nCppApplication {\n Depends { name: 'Qt.core' }\n" + qbsFile.write("CppApplication {\n Depends { name: 'Qt.core' }\n" " files: ['main.cpp', 'myobject.cpp']\n}"); qbsFile.close(); ProcessResultReceiver receiver; diff --git a/tests/auto/auto.qbs b/tests/auto/auto.qbs index 0d87af9fe..2f0aef37c 100644 --- a/tests/auto/auto.qbs +++ b/tests/auto/auto.qbs @@ -1,5 +1,3 @@ -import qbs - Project { name: "Autotests" references: [ diff --git a/tests/auto/blackbox/testdata-apple/aggregateDependencyLinking/aggregateDependencyLinking.qbs b/tests/auto/blackbox/testdata-apple/aggregateDependencyLinking/aggregateDependencyLinking.qbs index 0dc55fde9..6f57c1e44 100644 --- a/tests/auto/blackbox/testdata-apple/aggregateDependencyLinking/aggregateDependencyLinking.qbs +++ b/tests/auto/blackbox/testdata-apple/aggregateDependencyLinking/aggregateDependencyLinking.qbs @@ -1,5 +1,3 @@ -import qbs - Project { minimumQbsVersion: "1.8" diff --git a/tests/auto/blackbox/testdata-qt/included-moc-cpp/included-moc-cpp.qbs b/tests/auto/blackbox/testdata-qt/included-moc-cpp/included-moc-cpp.qbs index 218d5c150..265b0c9e3 100644 --- a/tests/auto/blackbox/testdata-qt/included-moc-cpp/included-moc-cpp.qbs +++ b/tests/auto/blackbox/testdata-qt/included-moc-cpp/included-moc-cpp.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Utilities QtApplication { diff --git a/tests/auto/blackbox/testdata/deprecated-property/deprecated-property.qbs b/tests/auto/blackbox/testdata/deprecated-property/deprecated-property.qbs index a8efb97b5..e3dacffea 100644 --- a/tests/auto/blackbox/testdata/deprecated-property/deprecated-property.qbs +++ b/tests/auto/blackbox/testdata/deprecated-property/deprecated-property.qbs @@ -1,4 +1,4 @@ -import qbs +import qbs // FIXME: Don't remove this import because then the test fails! Product { Depends { name: "themodule" } diff --git a/tests/auto/blackbox/testdata/deprecated-property/modules/themodule/m.qbs b/tests/auto/blackbox/testdata/deprecated-property/modules/themodule/m.qbs index 106ed4135..cd6b0b70c 100644 --- a/tests/auto/blackbox/testdata/deprecated-property/modules/themodule/m.qbs +++ b/tests/auto/blackbox/testdata/deprecated-property/modules/themodule/m.qbs @@ -1,4 +1,4 @@ -import qbs +import qbs // FIXME: Don't remove this import because then the test fails! Module { property bool newProp diff --git a/tests/auto/blackbox/testdata/dynamic-project/dynamic-project.qbs b/tests/auto/blackbox/testdata/dynamic-project/dynamic-project.qbs index 52f7c940d..5acdb8892 100644 --- a/tests/auto/blackbox/testdata/dynamic-project/dynamic-project.qbs +++ b/tests/auto/blackbox/testdata/dynamic-project/dynamic-project.qbs @@ -23,7 +23,6 @@ Project var productFilePath = FileInfo.joinPaths(tempDir, name + ".qbs"); var file = new TextFile(productFilePath, TextFile.WriteOnly); try { - file.writeLine("import qbs"); file.writeLine("CppApplication"); file.writeLine("{"); file.writeLine("\tfiles: [ \"" + productSrcDir + "/*.cpp\" ]"); diff --git a/tests/auto/blackbox/testdata/freedesktop/freedesktop.qbs b/tests/auto/blackbox/testdata/freedesktop/freedesktop.qbs index 60c3d304f..b3519ba4c 100644 --- a/tests/auto/blackbox/testdata/freedesktop/freedesktop.qbs +++ b/tests/auto/blackbox/testdata/freedesktop/freedesktop.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { CppApplication { name: "main" diff --git a/tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs b/tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs index 353a40f8c..4e46da210 100644 --- a/tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs +++ b/tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { name: "grpc_cpp" consoleApplication: true diff --git a/tests/auto/blackbox/testdata/lexyacc/modules/bisonhelper/bisonhelper.qbs b/tests/auto/blackbox/testdata/lexyacc/modules/bisonhelper/bisonhelper.qbs index 449b130e2..cb93547d4 100644 --- a/tests/auto/blackbox/testdata/lexyacc/modules/bisonhelper/bisonhelper.qbs +++ b/tests/auto/blackbox/testdata/lexyacc/modules/bisonhelper/bisonhelper.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Process Module { diff --git a/tests/auto/blackbox/testdata/linker-library-duplicates/setup-run-environment.qbs b/tests/auto/blackbox/testdata/linker-library-duplicates/setup-run-environment.qbs index 9723fd3f5..e69cde064 100644 --- a/tests/auto/blackbox/testdata/linker-library-duplicates/setup-run-environment.qbs +++ b/tests/auto/blackbox/testdata/linker-library-duplicates/setup-run-environment.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { DynamicLibrary { id: idLib1 diff --git a/tests/auto/blackbox/testdata/linker-module-definition/linker-module-definition.qbs b/tests/auto/blackbox/testdata/linker-module-definition/linker-module-definition.qbs index 519b6e065..7425cdca5 100644 --- a/tests/auto/blackbox/testdata/linker-module-definition/linker-module-definition.qbs +++ b/tests/auto/blackbox/testdata/linker-module-definition/linker-module-definition.qbs @@ -1,5 +1,3 @@ -import qbs - Project { condition: { var result = qbs.targetPlatform === qbs.hostPlatform; diff --git a/tests/auto/blackbox/testdata/module-conditions/module-conditions.qbs b/tests/auto/blackbox/testdata/module-conditions/module-conditions.qbs index dc3768203..207df5ded 100644 --- a/tests/auto/blackbox/testdata/module-conditions/module-conditions.qbs +++ b/tests/auto/blackbox/testdata/module-conditions/module-conditions.qbs @@ -1,5 +1,3 @@ -import qbs - Project { Product { name: "p1" diff --git a/tests/auto/blackbox/testdata/no-such-profile/no-such-profile.qbs b/tests/auto/blackbox/testdata/no-such-profile/no-such-profile.qbs index 8e64ba478..1de3a4b10 100644 --- a/tests/auto/blackbox/testdata/no-such-profile/no-such-profile.qbs +++ b/tests/auto/blackbox/testdata/no-such-profile/no-such-profile.qbs @@ -1,5 +1,3 @@ -import qbs - Product { name: "theProduct" property int p diff --git a/tests/auto/blackbox/testdata/proper quoting/proper quoting.qbs b/tests/auto/blackbox/testdata/proper quoting/proper quoting.qbs index 2d9afb134..3330b8263 100644 --- a/tests/auto/blackbox/testdata/proper quoting/proper quoting.qbs +++ b/tests/auto/blackbox/testdata/proper quoting/proper quoting.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Project { Product { condition: { diff --git a/tests/auto/blackbox/testdata/protobuf-library-install/protobuf-library.qbs b/tests/auto/blackbox/testdata/protobuf-library-install/protobuf-library.qbs index e69ab8408..af7e6ced6 100644 --- a/tests/auto/blackbox/testdata/protobuf-library-install/protobuf-library.qbs +++ b/tests/auto/blackbox/testdata/protobuf-library-install/protobuf-library.qbs @@ -1,5 +1,3 @@ -import qbs - StaticLibrary { condition: { var result = qbs.targetPlatform === qbs.hostPlatform; diff --git a/tests/auto/blackbox/testdata/protobuf/addressbook_cpp.qbs b/tests/auto/blackbox/testdata/protobuf/addressbook_cpp.qbs index 5e6ffc508..ac97f6bd5 100644 --- a/tests/auto/blackbox/testdata/protobuf/addressbook_cpp.qbs +++ b/tests/auto/blackbox/testdata/protobuf/addressbook_cpp.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { condition: { var result = qbs.targetPlatform === qbs.hostPlatform; diff --git a/tests/auto/blackbox/testdata/protobuf/addressbook_nanopb.qbs b/tests/auto/blackbox/testdata/protobuf/addressbook_nanopb.qbs index 9640bb888..92243d31f 100644 --- a/tests/auto/blackbox/testdata/protobuf/addressbook_nanopb.qbs +++ b/tests/auto/blackbox/testdata/protobuf/addressbook_nanopb.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { condition: { var result = qbs.targetPlatform === qbs.hostPlatform; diff --git a/tests/auto/blackbox/testdata/protobuf/addressbook_objc.qbs b/tests/auto/blackbox/testdata/protobuf/addressbook_objc.qbs index 54433ea66..448a9284a 100644 --- a/tests/auto/blackbox/testdata/protobuf/addressbook_objc.qbs +++ b/tests/auto/blackbox/testdata/protobuf/addressbook_objc.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { condition: { var result = qbs.targetPlatform === qbs.hostPlatform; diff --git a/tests/auto/blackbox/testdata/protobuf/create-proto-library.qbs b/tests/auto/blackbox/testdata/protobuf/create-proto-library.qbs index b01a47a39..d888937f1 100644 --- a/tests/auto/blackbox/testdata/protobuf/create-proto-library.qbs +++ b/tests/auto/blackbox/testdata/protobuf/create-proto-library.qbs @@ -1,5 +1,3 @@ -import qbs - Project { StaticLibrary { condition: { diff --git a/tests/auto/blackbox/testdata/protobuf/import.qbs b/tests/auto/blackbox/testdata/protobuf/import.qbs index ef4e80c1b..4d7e1b5c9 100644 --- a/tests/auto/blackbox/testdata/protobuf/import.qbs +++ b/tests/auto/blackbox/testdata/protobuf/import.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { condition: { var result = qbs.targetPlatform === qbs.hostPlatform; diff --git a/tests/auto/blackbox/testdata/protobuf/needs-import-dir.qbs b/tests/auto/blackbox/testdata/protobuf/needs-import-dir.qbs index 493632a0e..4914ea484 100644 --- a/tests/auto/blackbox/testdata/protobuf/needs-import-dir.qbs +++ b/tests/auto/blackbox/testdata/protobuf/needs-import-dir.qbs @@ -1,5 +1,3 @@ -import qbs - CppApplication { condition: { var result = qbs.targetPlatform === qbs.hostPlatform; diff --git a/tests/auto/buildgraph/buildgraph.qbs b/tests/auto/buildgraph/buildgraph.qbs index c6414b688..694d59578 100644 --- a/tests/auto/buildgraph/buildgraph.qbs +++ b/tests/auto/buildgraph/buildgraph.qbs @@ -1,5 +1,3 @@ -import qbs - QbsUnittest { Depends { name: "qbsconsolelogger" } testName: "buildgraph" diff --git a/tests/auto/cmdlineparser/cmdlineparser.qbs b/tests/auto/cmdlineparser/cmdlineparser.qbs index 47ed0a776..340a0c42e 100644 --- a/tests/auto/cmdlineparser/cmdlineparser.qbs +++ b/tests/auto/cmdlineparser/cmdlineparser.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Utilities QbsAutotest { diff --git a/tests/auto/language/language.qbs b/tests/auto/language/language.qbs index d3619a243..3767477db 100644 --- a/tests/auto/language/language.qbs +++ b/tests/auto/language/language.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Utilities QbsUnittest { diff --git a/tests/auto/language/testdata/dotted-names/dotted-names.qbs b/tests/auto/language/testdata/dotted-names/dotted-names.qbs index cf5658384..714988f0b 100644 --- a/tests/auto/language/testdata/dotted-names/dotted-names.qbs +++ b/tests/auto/language/testdata/dotted-names/dotted-names.qbs @@ -1,5 +1,3 @@ -import qbs - Project { name: "theProject" property bool includeDottedProduct diff --git a/tests/auto/language/testdata/dotted-names/modules/x/y/xy.qbs b/tests/auto/language/testdata/dotted-names/modules/x/y/xy.qbs index 71cfac9cb..eee46458d 100644 --- a/tests/auto/language/testdata/dotted-names/modules/x/y/xy.qbs +++ b/tests/auto/language/testdata/dotted-names/modules/x/y/xy.qbs @@ -1,5 +1,3 @@ -import qbs - Module { property string z: "default" } diff --git a/tests/auto/language/testdata/erroneous/duplicate-multiplex-value.qbs b/tests/auto/language/testdata/erroneous/duplicate-multiplex-value.qbs index 56da41af1..965fd36f7 100644 --- a/tests/auto/language/testdata/erroneous/duplicate-multiplex-value.qbs +++ b/tests/auto/language/testdata/erroneous/duplicate-multiplex-value.qbs @@ -1,4 +1,4 @@ -import qbs +import qbs // FIXME: Don't remove this import because then the test fails! Product { name: "p" diff --git a/tests/auto/language/testdata/erroneous/duplicate-multiplex-value2.qbs b/tests/auto/language/testdata/erroneous/duplicate-multiplex-value2.qbs index e412e5210..e6ed35d42 100644 --- a/tests/auto/language/testdata/erroneous/duplicate-multiplex-value2.qbs +++ b/tests/auto/language/testdata/erroneous/duplicate-multiplex-value2.qbs @@ -1,4 +1,4 @@ -import qbs +import qbs // FIXME: Don't remove this import because then the test fails! Product { name: "p" diff --git a/tests/auto/language/testdata/erroneous/original-in-export-item.qbs b/tests/auto/language/testdata/erroneous/original-in-export-item.qbs index 51fedb9a2..06adeb111 100644 --- a/tests/auto/language/testdata/erroneous/original-in-export-item.qbs +++ b/tests/auto/language/testdata/erroneous/original-in-export-item.qbs @@ -1,4 +1,4 @@ -import qbs +import qbs // FIXME: Don't remove this import because then the test fails! Project { Product { diff --git a/tests/auto/language/testdata/erroneous/original-in-export-item2.qbs b/tests/auto/language/testdata/erroneous/original-in-export-item2.qbs index d932d4aee..68b83118f 100644 --- a/tests/auto/language/testdata/erroneous/original-in-export-item2.qbs +++ b/tests/auto/language/testdata/erroneous/original-in-export-item2.qbs @@ -1,4 +1,4 @@ -import qbs +import qbs // FIXME: Don't remove this import because then the test fails! Project { Product { diff --git a/tests/auto/language/testdata/erroneous/original-in-export-item3.qbs b/tests/auto/language/testdata/erroneous/original-in-export-item3.qbs index d7bcb322e..30b30dd0e 100644 --- a/tests/auto/language/testdata/erroneous/original-in-export-item3.qbs +++ b/tests/auto/language/testdata/erroneous/original-in-export-item3.qbs @@ -1,4 +1,4 @@ -import qbs +import qbs // FIXME: Don't remove this import because then the test fails! Project { Product { diff --git a/tests/auto/language/testdata/erroneous/original-in-module-prototype.qbs b/tests/auto/language/testdata/erroneous/original-in-module-prototype.qbs index e7128092a..00661fb66 100644 --- a/tests/auto/language/testdata/erroneous/original-in-module-prototype.qbs +++ b/tests/auto/language/testdata/erroneous/original-in-module-prototype.qbs @@ -1,5 +1,3 @@ -import qbs - Product { Depends { name: "module-with-invalid-original" } } diff --git a/tests/auto/language/testdata/eval-error-in-non-present-module.qbs b/tests/auto/language/testdata/eval-error-in-non-present-module.qbs index c112bc6d4..6882a2216 100644 --- a/tests/auto/language/testdata/eval-error-in-non-present-module.qbs +++ b/tests/auto/language/testdata/eval-error-in-non-present-module.qbs @@ -1,5 +1,3 @@ -import qbs - Product { name: "p" property bool moduleRequired diff --git a/tests/auto/language/testdata/inherited-properties-items/imports/DebugName.qbs b/tests/auto/language/testdata/inherited-properties-items/imports/DebugName.qbs index 5ac15658c..d129dc9db 100644 --- a/tests/auto/language/testdata/inherited-properties-items/imports/DebugName.qbs +++ b/tests/auto/language/testdata/inherited-properties-items/imports/DebugName.qbs @@ -1,5 +1,3 @@ -import qbs - Properties { condition: qbs.buildVariant === "debug" name: "product_debug" diff --git a/tests/auto/language/testdata/inherited-properties-items/imports/ReleaseName.qbs b/tests/auto/language/testdata/inherited-properties-items/imports/ReleaseName.qbs index e33c5652b..57ab96a7e 100644 --- a/tests/auto/language/testdata/inherited-properties-items/imports/ReleaseName.qbs +++ b/tests/auto/language/testdata/inherited-properties-items/imports/ReleaseName.qbs @@ -1,5 +1,3 @@ -import qbs - Properties { condition: qbs.buildVariant === "release" name: "product_release" diff --git a/tests/auto/language/testdata/inherited-properties-items/inherited-properties-items-product.qbs b/tests/auto/language/testdata/inherited-properties-items/inherited-properties-items-product.qbs index c20f045c8..6d148ba53 100644 --- a/tests/auto/language/testdata/inherited-properties-items/inherited-properties-items-product.qbs +++ b/tests/auto/language/testdata/inherited-properties-items/inherited-properties-items-product.qbs @@ -1,5 +1,3 @@ -import qbs - Product { name: "product_default" DebugName {} diff --git a/tests/auto/language/testdata/inherited-properties-items/inherited-properties-items.qbs b/tests/auto/language/testdata/inherited-properties-items/inherited-properties-items.qbs index 40d41c2fb..52f7ffc00 100644 --- a/tests/auto/language/testdata/inherited-properties-items/inherited-properties-items.qbs +++ b/tests/auto/language/testdata/inherited-properties-items/inherited-properties-items.qbs @@ -1,5 +1,3 @@ -import qbs - Project { qbsSearchPaths: sourceDirectory references: "inherited-properties-items-product.qbs" diff --git a/tests/auto/language/testdata/modules/broken/broken.qbs b/tests/auto/language/testdata/modules/broken/broken.qbs index b960117cf..302573bbf 100644 --- a/tests/auto/language/testdata/modules/broken/broken.qbs +++ b/tests/auto/language/testdata/modules/broken/broken.qbs @@ -1,4 +1,4 @@ -import qbs +import qbs // FIXME: Don't remove this import because then the test fails! Module { Probe { diff --git a/tests/auto/language/tst_language.cpp b/tests/auto/language/tst_language.cpp index 4837d6000..cbb7d7556 100644 --- a/tests/auto/language/tst_language.cpp +++ b/tests/auto/language/tst_language.cpp @@ -3212,8 +3212,7 @@ void TestLanguage::wildcards() QVERIFY(projectFile.open(QIODevice::WriteOnly)); QTextStream s(&projectFile); using Qt::endl; - s << "import qbs.base 1.0" << endl << endl - << "Application {" << endl + s << "Application {" << endl << " name: \"MyProduct\"" << endl; if (useGroup) { s << " Group {" << endl diff --git a/tests/auto/tools/tools.qbs b/tests/auto/tools/tools.qbs index 384ba74eb..781d6edae 100644 --- a/tests/auto/tools/tools.qbs +++ b/tests/auto/tools/tools.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.Utilities QbsUnittest { |