use the simplified base import statement

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

38 files changed, 38 insertions, 38 deletions

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 {