use the simplified base import statement

Change-Id: I3c9e5d5512cad7028026d6166a0783fd507e7826
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

105 files changed, 105 insertions, 105 deletions

diff --git a/doc/items/group.qbs b/doc/items/group.qbs
index d0beaebdb..8797effd3 100644
--- a/doc/items/group.qbs
+++ b/doc/items/group.qbs
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-import qbs.base 1.0
+import qbs 1.0
 
 Project {
     Product {
diff --git a/share/qbs/imports/qbs/base/CppApplication.qbs b/share/qbs/imports/qbs/base/CppApplication.qbs
index 021f431d9..605f6a257 100644
--- a/share/qbs/imports/qbs/base/CppApplication.qbs
+++ b/share/qbs/imports/qbs/base/CppApplication.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Application {
     Depends { name: "cpp" }
diff --git a/share/qbs/imports/qbs/base/QmlApp.qbs b/share/qbs/imports/qbs/base/QmlApp.qbs
index 76f97530a..ee0e75eed 100644
--- a/share/qbs/imports/qbs/base/QmlApp.qbs
+++ b/share/qbs/imports/qbs/base/QmlApp.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Product {
     type: [qbs.targetOS == 'mac' ? "applicationbundle" : "application"]
diff --git a/share/qbs/imports/qbs/probes/BinaryProbe.qbs b/share/qbs/imports/qbs/probes/BinaryProbe.qbs
index ffec51eb9..2b00f52d4 100644
--- a/share/qbs/imports/qbs/probes/BinaryProbe.qbs
+++ b/share/qbs/imports/qbs/probes/BinaryProbe.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 PathProbe {
     platformPaths: undefined
diff --git a/share/qbs/imports/qbs/probes/IncludeProbe.qbs b/share/qbs/imports/qbs/probes/IncludeProbe.qbs
index 1c26b1d89..af993f167 100644
--- a/share/qbs/imports/qbs/probes/IncludeProbe.qbs
+++ b/share/qbs/imports/qbs/probes/IncludeProbe.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 PathProbe {
     pathSuffixes: [ "include" ]
diff --git a/share/qbs/imports/qbs/probes/PathProbe.qbs b/share/qbs/imports/qbs/probes/PathProbe.qbs
index 7ad7238b1..9a345d373 100644
--- a/share/qbs/imports/qbs/probes/PathProbe.qbs
+++ b/share/qbs/imports/qbs/probes/PathProbe.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import qbs.fileinfo as FileInfo
 import "utils.js" as Utils
 
diff --git a/share/qbs/imports/qbs/probes/PkgConfigProbe.qbs b/share/qbs/imports/qbs/probes/PkgConfigProbe.qbs
index 7ac15a944..5a50cda8f 100644
--- a/share/qbs/imports/qbs/probes/PkgConfigProbe.qbs
+++ b/share/qbs/imports/qbs/probes/PkgConfigProbe.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import qbs.fileinfo as FileInfo
 import "utils.js" as Utils
 
diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs
index cc9fe3d95..0257ca6b5 100644
--- a/share/qbs/modules/cpp/GenericGCC.qbs
+++ b/share/qbs/modules/cpp/GenericGCC.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import qbs.fileinfo as FileInfo
 import 'gcc.js' as Gcc
 import '../utils.js' as ModUtils
diff --git a/share/qbs/modules/cpp/UnixGCC.qbs b/share/qbs/modules/cpp/UnixGCC.qbs
index 42dd6e213..3d1a0b9b9 100644
--- a/share/qbs/modules/cpp/UnixGCC.qbs
+++ b/share/qbs/modules/cpp/UnixGCC.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 GenericGCC {
     condition: false
diff --git a/share/qbs/modules/cpp/genericunix-gcc.qbs b/share/qbs/modules/cpp/genericunix-gcc.qbs
index d35c444b6..faf09c595 100644
--- a/share/qbs/modules/cpp/genericunix-gcc.qbs
+++ b/share/qbs/modules/cpp/genericunix-gcc.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 UnixGCC {
     condition: qbs.targetOS === 'unix' && qbs.toolchain === 'gcc'
diff --git a/share/qbs/modules/cpp/linux-gcc.qbs b/share/qbs/modules/cpp/linux-gcc.qbs
index 88968ddfe..af2816c30 100644
--- a/share/qbs/modules/cpp/linux-gcc.qbs
+++ b/share/qbs/modules/cpp/linux-gcc.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 UnixGCC {
     condition: qbs.targetOS === 'linux' && qbs.toolchain === 'gcc'
diff --git a/share/qbs/modules/cpp/mac-gcc.qbs b/share/qbs/modules/cpp/mac-gcc.qbs
index 17ff08699..aea766c3c 100644
--- a/share/qbs/modules/cpp/mac-gcc.qbs
+++ b/share/qbs/modules/cpp/mac-gcc.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import '../utils.js' as ModUtils
 
 UnixGCC {
diff --git a/share/qbs/modules/cpp/windows-mingw.qbs b/share/qbs/modules/cpp/windows-mingw.qbs
index b84fbf156..30ca0fe98 100644
--- a/share/qbs/modules/cpp/windows-mingw.qbs
+++ b/share/qbs/modules/cpp/windows-mingw.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import qbs.fileinfo as FileInfo
 import '../utils.js' as ModUtils
 
diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs
index aadbf9974..23ec1dfca 100644
--- a/share/qbs/modules/cpp/windows-msvc.qbs
+++ b/share/qbs/modules/cpp/windows-msvc.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import qbs.fileinfo as FileInfo
 import '../utils.js' as ModUtils
 import 'msvc.js' as MSVC
diff --git a/share/qbs/modules/qbs/common.qbs b/share/qbs/modules/qbs/common.qbs
index 755992a42..95b069876 100644
--- a/share/qbs/modules/qbs/common.qbs
+++ b/share/qbs/modules/qbs/common.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import qbs.fileinfo as FileInfo
 
 Module {
diff --git a/share/qbs/modules/qt/QtModule.qbs b/share/qbs/modules/qt/QtModule.qbs
index f15a21bdc..66b497365 100644
--- a/share/qbs/modules/qt/QtModule.qbs
+++ b/share/qbs/modules/qt/QtModule.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import qbs.fileinfo as FileInfo
 import 'qtfunctions.js' as QtFunctions
 
diff --git a/share/qbs/modules/qt/concurrent/concurrent.qbs b/share/qbs/modules/qt/concurrent/concurrent.qbs
index 935f97411..748667f71 100644
--- a/share/qbs/modules/qt/concurrent/concurrent.qbs
+++ b/share/qbs/modules/qt/concurrent/concurrent.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import '../QtModule.qbs' as QtModule
 
 QtModule {
diff --git a/share/qbs/modules/qt/core/qtcore.qbs b/share/qbs/modules/qt/core/qtcore.qbs
index 00f5be588..4b8627e51 100644
--- a/share/qbs/modules/qt/core/qtcore.qbs
+++ b/share/qbs/modules/qt/core/qtcore.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import qbs.fileinfo as FileInfo
 import '../../utils.js' as ModUtils
 import "moc.js" as Moc
diff --git a/share/qbs/modules/qt/dbus/dbus.qbs b/share/qbs/modules/qt/dbus/dbus.qbs
index a0561e4a6..a429c7732 100644
--- a/share/qbs/modules/qt/dbus/dbus.qbs
+++ b/share/qbs/modules/qt/dbus/dbus.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import '../QtModule.qbs' as QtModule
 
 QtModule {
diff --git a/share/qbs/modules/qt/declarative/declarative.qbs b/share/qbs/modules/qt/declarative/declarative.qbs
index a55fcb46b..6a836032e 100644
--- a/share/qbs/modules/qt/declarative/declarative.qbs
+++ b/share/qbs/modules/qt/declarative/declarative.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import '../QtModule.qbs' as QtModule
 
 QtModule {
diff --git a/share/qbs/modules/qt/designer/designer.qbs b/share/qbs/modules/qt/designer/designer.qbs
index 93303f6db..b387bd8a0 100644
--- a/share/qbs/modules/qt/designer/designer.qbs
+++ b/share/qbs/modules/qt/designer/designer.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import '../QtModule.qbs' as QtModule
 
 QtModule {
diff --git a/share/qbs/modules/qt/designercomponents/designercomponents.qbs b/share/qbs/modules/qt/designercomponents/designercomponents.qbs
index 1360f9a9c..b304e6efe 100644
--- a/share/qbs/modules/qt/designercomponents/designercomponents.qbs
+++ b/share/qbs/modules/qt/designercomponents/designercomponents.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import '../QtModule.qbs' as QtModule
 
 QtModule {
diff --git a/share/qbs/modules/qt/gui/qtgui.qbs b/share/qbs/modules/qt/gui/qtgui.qbs
index bf6c69319..99d9f3086 100644
--- a/share/qbs/modules/qt/gui/qtgui.qbs
+++ b/share/qbs/modules/qt/gui/qtgui.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import qbs.fileinfo as FileInfo
 import '../QtModule.qbs' as QtModule
 import '../../utils.js' as ModUtils
diff --git a/share/qbs/modules/qt/help/help.qbs b/share/qbs/modules/qt/help/help.qbs
index 904b71e95..5124817be 100644
--- a/share/qbs/modules/qt/help/help.qbs
+++ b/share/qbs/modules/qt/help/help.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import '../QtModule.qbs' as QtModule
 
 QtModule {
diff --git a/share/qbs/modules/qt/jsonstream/module.qbs b/share/qbs/modules/qt/jsonstream/module.qbs
index d2f3c8ab9..9fd0c2189 100644
--- a/share/qbs/modules/qt/jsonstream/module.qbs
+++ b/share/qbs/modules/qt/jsonstream/module.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import '../QtModule.qbs' as QtModule
 
 QtModule {
diff --git a/share/qbs/modules/qt/network/network.qbs b/share/qbs/modules/qt/network/network.qbs
index 367b0b06e..3d7682322 100644
--- a/share/qbs/modules/qt/network/network.qbs
+++ b/share/qbs/modules/qt/network/network.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import '../QtModule.qbs' as QtModule
 
 QtModule {
diff --git a/share/qbs/modules/qt/opengl/opengl.qbs b/share/qbs/modules/qt/opengl/opengl.qbs
index b90ab5766..2a9507b42 100644
--- a/share/qbs/modules/qt/opengl/opengl.qbs
+++ b/share/qbs/modules/qt/opengl/opengl.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import '../QtModule.qbs' as QtModule
 
 QtModule {
diff --git a/share/qbs/modules/qt/phonon/phonon.qbs b/share/qbs/modules/qt/phonon/phonon.qbs
index 04cd27830..d55355530 100644
--- a/share/qbs/modules/qt/phonon/phonon.qbs
+++ b/share/qbs/modules/qt/phonon/phonon.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import '../QtModule.qbs' as QtModule
 
 QtModule {
diff --git a/share/qbs/modules/qt/printsupport/printsupport.qbs b/share/qbs/modules/qt/printsupport/printsupport.qbs
index 00e7cae1d..dba511217 100644
--- a/share/qbs/modules/qt/printsupport/printsupport.qbs
+++ b/share/qbs/modules/qt/printsupport/printsupport.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import '../QtModule.qbs' as QtModule
 
 QtModule {
diff --git a/share/qbs/modules/qt/qml/qml.qbs b/share/qbs/modules/qt/qml/qml.qbs
index c0775fe87..81a1219b6 100644
--- a/share/qbs/modules/qt/qml/qml.qbs
+++ b/share/qbs/modules/qt/qml/qml.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import '../QtModule.qbs' as QtModule
 
 QtModule {
diff --git a/share/qbs/modules/qt/quick/quick.qbs b/share/qbs/modules/qt/quick/quick.qbs
index 237c75803..f05bb37b4 100644
--- a/share/qbs/modules/qt/quick/quick.qbs
+++ b/share/qbs/modules/qt/quick/quick.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import '../QtModule.qbs' as QtModule
 
 QtModule {
diff --git a/share/qbs/modules/qt/script/script.qbs b/share/qbs/modules/qt/script/script.qbs
index f3c2c8a7a..c13ee7e62 100644
--- a/share/qbs/modules/qt/script/script.qbs
+++ b/share/qbs/modules/qt/script/script.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import '../QtModule.qbs' as QtModule
 
 QtModule {
diff --git a/share/qbs/modules/qt/sql/sql.qbs b/share/qbs/modules/qt/sql/sql.qbs
index 2b205e61b..23e76aace 100644
--- a/share/qbs/modules/qt/sql/sql.qbs
+++ b/share/qbs/modules/qt/sql/sql.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import '../QtModule.qbs' as QtModule
 
 QtModule {
diff --git a/share/qbs/modules/qt/svg/svg.qbs b/share/qbs/modules/qt/svg/svg.qbs
index b932ae45a..42f5675a6 100644
--- a/share/qbs/modules/qt/svg/svg.qbs
+++ b/share/qbs/modules/qt/svg/svg.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import '../QtModule.qbs' as QtModule
 
 QtModule {
diff --git a/share/qbs/modules/qt/test/test.qbs b/share/qbs/modules/qt/test/test.qbs
index 831f38560..5bb1d50c7 100644
--- a/share/qbs/modules/qt/test/test.qbs
+++ b/share/qbs/modules/qt/test/test.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import '../QtModule.qbs' as QtModule
 
 QtModule {
diff --git a/share/qbs/modules/qt/webkit/webkit.qbs b/share/qbs/modules/qt/webkit/webkit.qbs
index b2755aa57..dee4a1bde 100644
--- a/share/qbs/modules/qt/webkit/webkit.qbs
+++ b/share/qbs/modules/qt/webkit/webkit.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import '../QtModule.qbs' as QtModule
 
 QtModule {
diff --git a/share/qbs/modules/qt/widgets/qtwidgets.qbs b/share/qbs/modules/qt/widgets/qtwidgets.qbs
index abb2aae71..bb8c43127 100644
--- a/share/qbs/modules/qt/widgets/qtwidgets.qbs
+++ b/share/qbs/modules/qt/widgets/qtwidgets.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import '../QtModule.qbs' as QtModule
 
 QtModule {
diff --git a/share/qbs/modules/qt/xml/xml.qbs b/share/qbs/modules/qt/xml/xml.qbs
index c5a1da45c..02f30e25d 100644
--- a/share/qbs/modules/qt/xml/xml.qbs
+++ b/share/qbs/modules/qt/xml/xml.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import '../QtModule.qbs' as QtModule
 
 QtModule {
diff --git a/share/qbs/modules/qt/xmlpatterns/qtxmlpatterns.qbs b/share/qbs/modules/qt/xmlpatterns/qtxmlpatterns.qbs
index 096da7290..a09dd8656 100644
--- a/share/qbs/modules/qt/xmlpatterns/qtxmlpatterns.qbs
+++ b/share/qbs/modules/qt/xmlpatterns/qtxmlpatterns.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import '../QtModule.qbs' as QtModule
 
 QtModule {
diff --git a/src/lib/language/testdata/conditionaldepends.qbs b/src/lib/language/testdata/conditionaldepends.qbs
index 348f518ee..71a763dc9 100644
--- a/src/lib/language/testdata/conditionaldepends.qbs
+++ b/src/lib/language/testdata/conditionaldepends.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import "conditionaldepends_base.qbs" as CondBase
 
 Project {
diff --git a/src/lib/language/testdata/conditionaldepends_base.qbs b/src/lib/language/testdata/conditionaldepends_base.qbs
index 7c9a859e2..81782ba44 100644
--- a/src/lib/language/testdata/conditionaldepends_base.qbs
+++ b/src/lib/language/testdata/conditionaldepends_base.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Application {
     name: 'conditionaldepends_base'
diff --git a/src/lib/language/testdata/filetags.qbs b/src/lib/language/testdata/filetags.qbs
index c47eaa5ed..894fe9298 100644
--- a/src/lib/language/testdata/filetags.qbs
+++ b/src/lib/language/testdata/filetags.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Project {
     FileTagger {
diff --git a/src/lib/language/testdata/groupconditions.qbs b/src/lib/language/testdata/groupconditions.qbs
index 40e9db46e..27433329d 100644
--- a/src/lib/language/testdata/groupconditions.qbs
+++ b/src/lib/language/testdata/groupconditions.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Project {
     property bool someTrueProperty: true
diff --git a/src/lib/language/testdata/idusage.qbs b/src/lib/language/testdata/idusage.qbs
index dc6955add..42dc43ad5 100644
--- a/src/lib/language/testdata/idusage.qbs
+++ b/src/lib/language/testdata/idusage.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import "idusagebase.qbs" as DerivedProduct
 
 Project {
diff --git a/src/lib/language/testdata/modules/dummy2/dummy2.qbs b/src/lib/language/testdata/modules/dummy2/dummy2.qbs
index 53143f331..f60c38a71 100644
--- a/src/lib/language/testdata/modules/dummy2/dummy2.qbs
+++ b/src/lib/language/testdata/modules/dummy2/dummy2.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Module {
     property var defines
diff --git a/src/lib/language/testdata/modules/dummyqt/core/dummycore.qbs b/src/lib/language/testdata/modules/dummyqt/core/dummycore.qbs
index b11496229..971062d65 100644
--- a/src/lib/language/testdata/modules/dummyqt/core/dummycore.qbs
+++ b/src/lib/language/testdata/modules/dummyqt/core/dummycore.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Module {
     id: qtcore
diff --git a/src/lib/language/testdata/modules/dummyqt/gui/dummygui.qbs b/src/lib/language/testdata/modules/dummyqt/gui/dummygui.qbs
index 9788ffd47..74987561e 100644
--- a/src/lib/language/testdata/modules/dummyqt/gui/dummygui.qbs
+++ b/src/lib/language/testdata/modules/dummyqt/gui/dummygui.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Module {
     Depends { name: "dummyqt.core" }
diff --git a/src/lib/language/testdata/modules/dummyqt/network/dummynetwork.qbs b/src/lib/language/testdata/modules/dummyqt/network/dummynetwork.qbs
index 8934c9b46..b1193be5a 100644
--- a/src/lib/language/testdata/modules/dummyqt/network/dummynetwork.qbs
+++ b/src/lib/language/testdata/modules/dummyqt/network/dummynetwork.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Module {
     Depends { name: "dummyqt"; submodules: ["core"] }
diff --git a/src/lib/language/testdata/outerInGroup.qbs b/src/lib/language/testdata/outerInGroup.qbs
index 50e6d13fe..751392a4d 100644
--- a/src/lib/language/testdata/outerInGroup.qbs
+++ b/src/lib/language/testdata/outerInGroup.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Project {
     Product {
diff --git a/src/lib/language/testdata/productconditions.qbs b/src/lib/language/testdata/productconditions.qbs
index 67bccd08e..7a6ccfd70 100644
--- a/src/lib/language/testdata/productconditions.qbs
+++ b/src/lib/language/testdata/productconditions.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Project {
     Product {
diff --git a/src/lib/language/testdata/productmodules.qbs b/src/lib/language/testdata/productmodules.qbs
index 97b454308..5fd48c7aa 100644
--- a/src/lib/language/testdata/productmodules.qbs
+++ b/src/lib/language/testdata/productmodules.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Project {
     Application {
diff --git a/src/lib/language/testdata/propertiesblocks.qbs b/src/lib/language/testdata/propertiesblocks.qbs
index eb3dce8f3..20e841e3d 100644
--- a/src/lib/language/testdata/propertiesblocks.qbs
+++ b/src/lib/language/testdata/propertiesblocks.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Project {
     Product {
diff --git a/tests/auto/blackbox/testdata/buildproperties_source/bp_source.qbs b/tests/auto/blackbox/testdata/buildproperties_source/bp_source.qbs
index 0d6cb5741..df7649625 100644
--- a/tests/auto/blackbox/testdata/buildproperties_source/bp_source.qbs
+++ b/tests/auto/blackbox/testdata/buildproperties_source/bp_source.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Project {
     Product {
diff --git a/tests/auto/blackbox/testdata/clean/clean.qbs b/tests/auto/blackbox/testdata/clean/clean.qbs
index df5d69e68..fa6e4433f 100644
--- a/tests/auto/blackbox/testdata/clean/clean.qbs
+++ b/tests/auto/blackbox/testdata/clean/clean.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Project {
     // Explicit type needed to prevent bundle generation on Mac.
diff --git a/tests/auto/blackbox/testdata/codegen/codegen.qbs b/tests/auto/blackbox/testdata/codegen/codegen.qbs
index f387db8f1..4cf811a38 100644
--- a/tests/auto/blackbox/testdata/codegen/codegen.qbs
+++ b/tests/auto/blackbox/testdata/codegen/codegen.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import qbs.fileinfo as FileInfo
 
 Project {
diff --git a/tests/auto/blackbox/testdata/installed_artifact/installed_artifact.qbs b/tests/auto/blackbox/testdata/installed_artifact/installed_artifact.qbs
index 8b42f2188..aaac7aef1 100644
--- a/tests/auto/blackbox/testdata/installed_artifact/installed_artifact.qbs
+++ b/tests/auto/blackbox/testdata/installed_artifact/installed_artifact.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Application {
     name: "installedApp"
diff --git a/tests/auto/blackbox/testdata/lib_samesource/lib.qbs b/tests/auto/blackbox/testdata/lib_samesource/lib.qbs
index 587590e91..063684b40 100644
--- a/tests/auto/blackbox/testdata/lib_samesource/lib.qbs
+++ b/tests/auto/blackbox/testdata/lib_samesource/lib.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Project {
     Product {
diff --git a/tests/auto/blackbox/testdata/lotsofdots/lots.of.dots.qbs b/tests/auto/blackbox/testdata/lotsofdots/lots.of.dots.qbs
index b263fb873..3efe11c81 100644
--- a/tests/auto/blackbox/testdata/lotsofdots/lots.of.dots.qbs
+++ b/tests/auto/blackbox/testdata/lotsofdots/lots.of.dots.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Project {
     Product {
diff --git a/tests/auto/blackbox/testdata/moc_cpp/moc_cpp.qbs b/tests/auto/blackbox/testdata/moc_cpp/moc_cpp.qbs
index dd8ddf603..311d7c490 100644
--- a/tests/auto/blackbox/testdata/moc_cpp/moc_cpp.qbs
+++ b/tests/auto/blackbox/testdata/moc_cpp/moc_cpp.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Project {
     Product {
diff --git a/tests/auto/blackbox/testdata/moc_hpp/moc_hpp.qbs b/tests/auto/blackbox/testdata/moc_hpp/moc_hpp.qbs
index a730c93e8..a78e416aa 100644
--- a/tests/auto/blackbox/testdata/moc_hpp/moc_hpp.qbs
+++ b/tests/auto/blackbox/testdata/moc_hpp/moc_hpp.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Project {
     Product {
diff --git a/tests/auto/blackbox/testdata/moc_hpp_included/moc_hpp_included.qbs b/tests/auto/blackbox/testdata/moc_hpp_included/moc_hpp_included.qbs
index 1cdfb7fad..ae9dec26b 100644
--- a/tests/auto/blackbox/testdata/moc_hpp_included/moc_hpp_included.qbs
+++ b/tests/auto/blackbox/testdata/moc_hpp_included/moc_hpp_included.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Project {
     Product {
diff --git a/tests/auto/blackbox/testdata/productproperties/productproperties.qbs b/tests/auto/blackbox/testdata/productproperties/productproperties.qbs
index 639d4394f..0477e7786 100644
--- a/tests/auto/blackbox/testdata/productproperties/productproperties.qbs
+++ b/tests/auto/blackbox/testdata/productproperties/productproperties.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Project {
     property string blubbProp: 5
diff --git a/tests/auto/blackbox/testdata/project_filepath_check/project1.qbs b/tests/auto/blackbox/testdata/project_filepath_check/project1.qbs
index c090a9c52..5fc79d432 100644
--- a/tests/auto/blackbox/testdata/project_filepath_check/project1.qbs
+++ b/tests/auto/blackbox/testdata/project_filepath_check/project1.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+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 c090a9c52..5fc79d432 100644
--- a/tests/auto/blackbox/testdata/project_filepath_check/project2.qbs
+++ b/tests/auto/blackbox/testdata/project_filepath_check/project2.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 CppApplication {
     files: "main.cpp"
diff --git a/tests/auto/blackbox/testdata/qrc/i.qbs b/tests/auto/blackbox/testdata/qrc/i.qbs
index 11b9d1be3..46414a066 100644
--- a/tests/auto/blackbox/testdata/qrc/i.qbs
+++ b/tests/auto/blackbox/testdata/qrc/i.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Project {
     Product {
diff --git a/tests/auto/blackbox/testdata/recursive_renaming/recursive_renaming.qbs b/tests/auto/blackbox/testdata/recursive_renaming/recursive_renaming.qbs
index 6b2889a8b..6444212fc 100644
--- a/tests/auto/blackbox/testdata/recursive_renaming/recursive_renaming.qbs
+++ b/tests/auto/blackbox/testdata/recursive_renaming/recursive_renaming.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Product {
     Group {
diff --git a/tests/auto/blackbox/testdata/trackAddFile/after/project.qbs b/tests/auto/blackbox/testdata/trackAddFile/after/project.qbs
index 2e3a56102..747669d90 100644
--- a/tests/auto/blackbox/testdata/trackAddFile/after/project.qbs
+++ b/tests/auto/blackbox/testdata/trackAddFile/after/project.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Project {
     Product {
diff --git a/tests/auto/blackbox/testdata/trackAddFile/before/project.qbs b/tests/auto/blackbox/testdata/trackAddFile/before/project.qbs
index 222788b6a..0233020c2 100644
--- a/tests/auto/blackbox/testdata/trackAddFile/before/project.qbs
+++ b/tests/auto/blackbox/testdata/trackAddFile/before/project.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Project {
     Product {
diff --git a/tests/auto/blackbox/testdata/trackAddMocInclude/before/test.qbs b/tests/auto/blackbox/testdata/trackAddMocInclude/before/test.qbs
index 02250c897..1e1d79682 100644
--- a/tests/auto/blackbox/testdata/trackAddMocInclude/before/test.qbs
+++ b/tests/auto/blackbox/testdata/trackAddMocInclude/before/test.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Application {
     Depends { name: "Qt.core" }
diff --git a/tests/auto/blackbox/testdata/trackFileTags/after/project.qbs b/tests/auto/blackbox/testdata/trackFileTags/after/project.qbs
index 453658e98..5d4dd9eb2 100644
--- a/tests/auto/blackbox/testdata/trackFileTags/after/project.qbs
+++ b/tests/auto/blackbox/testdata/trackFileTags/after/project.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Project {
     Product {
diff --git a/tests/auto/blackbox/testdata/trackFileTags/before/project.qbs b/tests/auto/blackbox/testdata/trackFileTags/before/project.qbs
index 50400f157..9a19670cf 100644
--- a/tests/auto/blackbox/testdata/trackFileTags/before/project.qbs
+++ b/tests/auto/blackbox/testdata/trackFileTags/before/project.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Project {
     Product {
diff --git a/tests/auto/blackbox/testdata/trackQObjChange/i.qbs b/tests/auto/blackbox/testdata/trackQObjChange/i.qbs
index 0e103ecd9..381c63bcf 100644
--- a/tests/auto/blackbox/testdata/trackQObjChange/i.qbs
+++ b/tests/auto/blackbox/testdata/trackQObjChange/i.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Project {
     Product {
diff --git a/tests/auto/blackbox/testdata/wildcard_renaming/wildcard_renaming.qbs b/tests/auto/blackbox/testdata/wildcard_renaming/wildcard_renaming.qbs
index 9c9799dba..4cb2c071c 100644
--- a/tests/auto/blackbox/testdata/wildcard_renaming/wildcard_renaming.qbs
+++ b/tests/auto/blackbox/testdata/wildcard_renaming/wildcard_renaming.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Product {
     Group {
diff --git a/tests/auto/language/testdata/groupconditions.qbs b/tests/auto/language/testdata/groupconditions.qbs
index 40e9db46e..27433329d 100644
--- a/tests/auto/language/testdata/groupconditions.qbs
+++ b/tests/auto/language/testdata/groupconditions.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Project {
     property bool someTrueProperty: true
diff --git a/tests/manual/application/test.qbs b/tests/manual/application/test.qbs
index 4e993bedf..a2e71fccf 100644
--- a/tests/manual/application/test.qbs
+++ b/tests/manual/application/test.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Project {
     Product {
diff --git a/tests/manual/baseProperties/imports/Bar.qbs b/tests/manual/baseProperties/imports/Bar.qbs
index c25541dc4..07ab724e4 100644
--- a/tests/manual/baseProperties/imports/Bar.qbs
+++ b/tests/manual/baseProperties/imports/Bar.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Product {
     Depends { name: "cpp" }
diff --git a/tests/manual/baseProperties/imports/Foo.qbs b/tests/manual/baseProperties/imports/Foo.qbs
index d3da538dd..563992434 100644
--- a/tests/manual/baseProperties/imports/Foo.qbs
+++ b/tests/manual/baseProperties/imports/Foo.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Bar {
     type: "application"
diff --git a/tests/manual/baseProperties/prj.qbs b/tests/manual/baseProperties/prj.qbs
index c202916d6..a43b930dc 100644
--- a/tests/manual/baseProperties/prj.qbs
+++ b/tests/manual/baseProperties/prj.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import "imports/Foo.qbs" as Foo
 
 Project {
diff --git a/tests/manual/collidingmice/collidingmice.qbs b/tests/manual/collidingmice/collidingmice.qbs
index 26654b7ce..9c2a09bbe 100644
--- a/tests/manual/collidingmice/collidingmice.qbs
+++ b/tests/manual/collidingmice/collidingmice.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Application {
     name : "CollidingMice"
diff --git a/tests/manual/configure/configure.qbs b/tests/manual/configure/configure.qbs
index fd55ea2fa..a5efd2790 100644
--- a/tests/manual/configure/configure.qbs
+++ b/tests/manual/configure/configure.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import qbs.fileinfo as FileInfo
 
 Project {
diff --git a/tests/manual/configure/modules/definition/module.qbs b/tests/manual/configure/modules/definition/module.qbs
index d43f1c1bf..71b8ecf21 100644
--- a/tests/manual/configure/modules/definition/module.qbs
+++ b/tests/manual/configure/modules/definition/module.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Module {
     name: 'definition'
diff --git a/tests/manual/genmoc_cpp/moc_cpp.qbs b/tests/manual/genmoc_cpp/moc_cpp.qbs
index cc7a312b6..e16955eab 100644
--- a/tests/manual/genmoc_cpp/moc_cpp.qbs
+++ b/tests/manual/genmoc_cpp/moc_cpp.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import qbs.fileinfo as FileInfo
 
 Project {
diff --git a/tests/manual/groupTaggerConflict/test.qbs b/tests/manual/groupTaggerConflict/test.qbs
index 128d4495c..0941f2ade 100644
--- a/tests/manual/groupTaggerConflict/test.qbs
+++ b/tests/manual/groupTaggerConflict/test.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Project {
 
diff --git a/tests/manual/hello/hello.qbs b/tests/manual/hello/hello.qbs
index 322867e56..aeb46faf9 100644
--- a/tests/manual/hello/hello.qbs
+++ b/tests/manual/hello/hello.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Application {
     name: 'HelloWorld'
diff --git a/tests/manual/includeLookup/includeLookup.qbs b/tests/manual/includeLookup/includeLookup.qbs
index 020f9d338..780b40ed2 100644
--- a/tests/manual/includeLookup/includeLookup.qbs
+++ b/tests/manual/includeLookup/includeLookup.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import qbs.fileinfo as FileInfo
 
 Project {
diff --git a/tests/manual/includeLookup/modules/definition/module.qbs b/tests/manual/includeLookup/modules/definition/module.qbs
index c4123b7c8..0ee7bee18 100644
--- a/tests/manual/includeLookup/modules/definition/module.qbs
+++ b/tests/manual/includeLookup/modules/definition/module.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import qbs.probes as Probes
 
 Module {
diff --git a/tests/manual/inheritModuleSearchPath/imports/Foo.qbs b/tests/manual/inheritModuleSearchPath/imports/Foo.qbs
index d52dabbc9..f6c1733b5 100644
--- a/tests/manual/inheritModuleSearchPath/imports/Foo.qbs
+++ b/tests/manual/inheritModuleSearchPath/imports/Foo.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Product {
     type: "application"
diff --git a/tests/manual/inheritModuleSearchPath/prj.qbs b/tests/manual/inheritModuleSearchPath/prj.qbs
index f3f341ff0..0f5164f47 100644
--- a/tests/manual/inheritModuleSearchPath/prj.qbs
+++ b/tests/manual/inheritModuleSearchPath/prj.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import "imports/Foo.qbs" as Foo
 
 Project {
diff --git a/tests/manual/inheritModuleSearchPath/subdir/bli/m.qbs b/tests/manual/inheritModuleSearchPath/subdir/bli/m.qbs
index e33dab9a7..b4b93678a 100644
--- a/tests/manual/inheritModuleSearchPath/subdir/bli/m.qbs
+++ b/tests/manual/inheritModuleSearchPath/subdir/bli/m.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Module {
     Depends {name : "cpp" }
diff --git a/tests/manual/lib_subdir/app/app.qbs b/tests/manual/lib_subdir/app/app.qbs
index 4f7e959c5..b4e5bf529 100644
--- a/tests/manual/lib_subdir/app/app.qbs
+++ b/tests/manual/lib_subdir/app/app.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Product {
     type: "application"
diff --git a/tests/manual/lib_subdir/lib/lib.qbs b/tests/manual/lib_subdir/lib/lib.qbs
index 22ef0535d..036746692 100644
--- a/tests/manual/lib_subdir/lib/lib.qbs
+++ b/tests/manual/lib_subdir/lib/lib.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Product {
     type: "staticlibrary"
diff --git a/tests/manual/lib_subdir/lib_subdir.qbs b/tests/manual/lib_subdir/lib_subdir.qbs
index 71afd646f..56edf28a4 100644
--- a/tests/manual/lib_subdir/lib_subdir.qbs
+++ b/tests/manual/lib_subdir/lib_subdir.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 Project {
     references: [
         "app/app.qbs",
diff --git a/tests/manual/link_dynamiclib/link_dynamiclib.qbs b/tests/manual/link_dynamiclib/link_dynamiclib.qbs
index 810e72726..3204c3260 100644
--- a/tests/manual/link_dynamiclib/link_dynamiclib.qbs
+++ b/tests/manual/link_dynamiclib/link_dynamiclib.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Project {
     Application {
diff --git a/tests/manual/link_staticlib/link_staticlib.qbs b/tests/manual/link_staticlib/link_staticlib.qbs
index 645d06bc0..e1d6ef241 100644
--- a/tests/manual/link_staticlib/link_staticlib.qbs
+++ b/tests/manual/link_staticlib/link_staticlib.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Project {
     Application {
diff --git a/tests/manual/localDeployment/localDeployment.qbs b/tests/manual/localDeployment/localDeployment.qbs
index bd4819b81..c4894fd40 100644
--- a/tests/manual/localDeployment/localDeployment.qbs
+++ b/tests/manual/localDeployment/localDeployment.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Project {
     Product {
diff --git a/tests/manual/objc/objc.qbs b/tests/manual/objc/objc.qbs
index 76339385a..7dbcdc01b 100644
--- a/tests/manual/objc/objc.qbs
+++ b/tests/manual/objc/objc.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Project {
     CppApplication {
diff --git a/tests/manual/pch/pch.qbs b/tests/manual/pch/pch.qbs
index 664d134e6..bde8e57b6 100644
--- a/tests/manual/pch/pch.qbs
+++ b/tests/manual/pch/pch.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Product {
     type: "application"
diff --git a/tests/manual/pkgconfig/pkgconfig.qbs b/tests/manual/pkgconfig/pkgconfig.qbs
index 0e770385d..20121a638 100644
--- a/tests/manual/pkgconfig/pkgconfig.qbs
+++ b/tests/manual/pkgconfig/pkgconfig.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import qbs.probes as Probes
 
 Project {
diff --git a/tests/manual/productmoduledeps/productmoduledeps.qbs b/tests/manual/productmoduledeps/productmoduledeps.qbs
index 5e065f6b5..cc3547c0a 100644
--- a/tests/manual/productmoduledeps/productmoduledeps.qbs
+++ b/tests/manual/productmoduledeps/productmoduledeps.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Project {
     Application {
diff --git a/tests/manual/proper quoting/proper quoting.qbs b/tests/manual/proper quoting/proper quoting.qbs
index b721568c7..a2a80fc8b 100644
--- a/tests/manual/proper quoting/proper quoting.qbs
+++ b/tests/manual/proper quoting/proper quoting.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Project {
     Product {
diff --git a/tests/manual/propertiesblocks/propertiesblocks.qbs b/tests/manual/propertiesblocks/propertiesblocks.qbs
index ea7b23a42..f04762e69 100644
--- a/tests/manual/propertiesblocks/propertiesblocks.qbs
+++ b/tests/manual/propertiesblocks/propertiesblocks.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Product {
     Depends { name: 'cpp' }
diff --git a/tests/manual/qrc2/i.qbs b/tests/manual/qrc2/i.qbs
index 5f89b9f82..e5c310773 100644
--- a/tests/manual/qrc2/i.qbs
+++ b/tests/manual/qrc2/i.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Project {
     Product {
diff --git a/tests/manual/rc/rc.qbs b/tests/manual/rc/rc.qbs
index 814d38027..75502cf88 100644
--- a/tests/manual/rc/rc.qbs
+++ b/tests/manual/rc/rc.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Application {
     type: "application"
diff --git a/tests/manual/transformers/transformers.qbs b/tests/manual/transformers/transformers.qbs
index b188b1a11..fae68054a 100644
--- a/tests/manual/transformers/transformers.qbs
+++ b/tests/manual/transformers/transformers.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 import qbs.fileinfo as FileInfo
 
 Project {
diff --git a/tests/manual/uic/uic.qbs b/tests/manual/uic/uic.qbs
index 1c10dca76..cea4ec2a1 100644
--- a/tests/manual/uic/uic.qbs
+++ b/tests/manual/uic/uic.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 Project {
     Product {