aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/blackbox/testdata-qt
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2018-06-22 10:05:12 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2018-06-22 10:07:27 +0000
commit8cd4d92b2e2757225f06e76999afb57acc63629a (patch)
tree1ce2473a3c4e2588e6b5167cd2f3a7947624bc2b /tests/auto/blackbox/testdata-qt
parente3ef6758205349a5be04e2d7b13507c617ec32fe (diff)
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/blackbox/testdata-qt')
-rw-r--r--tests/auto/blackbox/testdata-qt/auto-qrc/auto-qrc.qbs2
-rw-r--r--tests/auto/blackbox/testdata-qt/cached-qml/cached-qml.qbs1
-rw-r--r--tests/auto/blackbox/testdata-qt/combined-moc/combined-moc.qbs2
-rw-r--r--tests/auto/blackbox/testdata-qt/dbus-adaptors/car.qbs2
-rw-r--r--tests/auto/blackbox/testdata-qt/dbus-interfaces/controller.qbs2
-rw-r--r--tests/auto/blackbox/testdata-qt/lrelease/lrelease.qbs2
-rw-r--r--tests/auto/blackbox/testdata-qt/mixed-build-variants/mixed-build-variants.qbs2
-rw-r--r--tests/auto/blackbox/testdata-qt/moc-and-cxx-combining/moc-and-cxx-combining.qbs2
-rw-r--r--tests/auto/blackbox/testdata-qt/moc-flags/moc-flags.qbs2
-rw-r--r--tests/auto/blackbox/testdata-qt/moc-same-file-name/moc-same-file-name.qbs2
-rw-r--r--tests/auto/blackbox/testdata-qt/pkgconfig/pkgconfig.qbs1
-rw-r--r--tests/auto/blackbox/testdata-qt/plugin-meta-data/plugin-meta-data.qbs2
-rw-r--r--tests/auto/blackbox/testdata-qt/qml-debugging/qml-debugging.qbs2
-rw-r--r--tests/auto/blackbox/testdata-qt/qobject-in-mm/qobject-in-mm.qbs2
-rw-r--r--tests/auto/blackbox/testdata-qt/qrc/i.qbs2
-rw-r--r--tests/auto/blackbox/testdata-qt/qt-keywords/qt-keywords.qbs2
-rw-r--r--tests/auto/blackbox/testdata-qt/qtscxml/qtscxml.qbs1
-rw-r--r--tests/auto/blackbox/testdata-qt/quick-compiler/quick-compiler.qbs2
-rw-r--r--tests/auto/blackbox/testdata-qt/remove-moc-header-from-file-list/remove-moc-header-from-file-list.qbs2
-rw-r--r--tests/auto/blackbox/testdata-qt/static-qt-plugin-linking/static-qt-plugin-linking.qbs2
-rw-r--r--tests/auto/blackbox/testdata-qt/trackAddMocInclude/before/test.qbs2
-rw-r--r--tests/auto/blackbox/testdata-qt/trackQObjChange/i.qbs2
-rw-r--r--tests/auto/blackbox/testdata-qt/unmocable/unmocable.qbs2
23 files changed, 0 insertions, 43 deletions
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"]