Remove `import qbs` from all project files

 ... because we don't need in this inclusion at all.

But for some cases it is impossible to remove that inclusions
(and even to move on next lines) because then the some tests
are failed by unknown reason. For those tests were added the
following comments on the inclusion lines:

`// FIXME: Don't remove this import because then the test fails!`

Change-Id: I9153fd0e38b94af08168e499ee46a23889ee4d73
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

30 files changed, 0 insertions, 44 deletions

diff --git a/src/app/apps.qbs b/src/app/apps.qbs
index ba20515f2..4ea0a2c87 100644
--- a/src/app/apps.qbs
+++ b/src/app/apps.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     references: [
         "config/config.qbs",
diff --git a/src/app/config-ui/config-ui.qbs b/src/app/config-ui/config-ui.qbs
index 8b5e37559..544542ca4 100644
--- a/src/app/config-ui/config-ui.qbs
+++ b/src/app/config-ui/config-ui.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 QbsApp {
     Depends { name: "Qt.widgets" }
     name: "qbs-config-ui"
diff --git a/src/app/config/config.qbs b/src/app/config/config.qbs
index 9daa701f6..2744b93f7 100644
--- a/src/app/config/config.qbs
+++ b/src/app/config/config.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 QbsApp {
     name: "qbs-config"
     files: [
diff --git a/src/app/qbs-create-project/createproject.cpp b/src/app/qbs-create-project/createproject.cpp
index cb6229ce3..f2f1364f5 100644
--- a/src/app/qbs-create-project/createproject.cpp
+++ b/src/app/qbs-create-project/createproject.cpp
@@ -104,7 +104,6 @@ void ProjectCreator::serializeProject(const ProjectCreator::Project &project)
     }
     QTextStream fileContents(&projectFile);
     qbs::setupDefaultCodec(fileContents);
-    fileContents << "import qbs\n\n";
     if (!project.fileNames.empty() || m_projectStructure == ProjectStructure::Flat) {
         fileContents << "Product {\n";
         const ProductFlags productFlags = getFlags(project);
diff --git a/src/app/qbs-create-project/qbs-create-project.qbs b/src/app/qbs-create-project/qbs-create-project.qbs
index b65f9177f..ae79001ee 100644
--- a/src/app/qbs-create-project/qbs-create-project.qbs
+++ b/src/app/qbs-create-project/qbs-create-project.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 QbsApp {
     name: "qbs-create-project"
     files: [
diff --git a/src/app/qbs-setup-android/qbs-setup-android.qbs b/src/app/qbs-setup-android/qbs-setup-android.qbs
index 949c07c45..b18e152b0 100644
--- a/src/app/qbs-setup-android/qbs-setup-android.qbs
+++ b/src/app/qbs-setup-android/qbs-setup-android.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 QbsApp {
     name: "qbs-setup-android"
     files: [
diff --git a/src/app/qbs-setup-qt/qbs-setup-qt.qbs b/src/app/qbs-setup-qt/qbs-setup-qt.qbs
index 44f2b7f05..3be090155 100644
--- a/src/app/qbs-setup-qt/qbs-setup-qt.qbs
+++ b/src/app/qbs-setup-qt/qbs-setup-qt.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 QbsApp {
     name: "qbs-setup-qt"
     files: [
diff --git a/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs b/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs
index d33b4c8fb..2daf916e9 100644
--- a/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs
+++ b/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 QbsApp {
     name: "qbs-setup-toolchains"
     cpp.dynamicLibraries: qbs.targetOS.contains("windows") ? base.concat("shell32") : base
diff --git a/src/app/qbs/qbs.qbs b/src/app/qbs/qbs.qbs
index 530036f3a..03685dd21 100644
--- a/src/app/qbs/qbs.qbs
+++ b/src/app/qbs/qbs.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import qbs.Utilities
 
 QbsApp {
diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs
index cece18126..0648a051f 100644
--- a/src/lib/corelib/corelib.qbs
+++ b/src/lib/corelib/corelib.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import qbs.Utilities
 
 QbsLibrary {
diff --git a/src/lib/libs.qbs b/src/lib/libs.qbs
index 1cea47c52..264036e1a 100644
--- a/src/lib/libs.qbs
+++ b/src/lib/libs.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     references: [
         "corelib/corelib.qbs",
diff --git a/src/lib/msbuild/msbuild.qbs b/src/lib/msbuild/msbuild.qbs
index 897960303..505b977be 100644
--- a/src/lib/msbuild/msbuild.qbs
+++ b/src/lib/msbuild/msbuild.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 QbsStaticLibrary {
     Depends { name: "cpp" }
     Depends { name: "qbscore" }
diff --git a/src/lib/scriptengine/scriptengine.qbs b/src/lib/scriptengine/scriptengine.qbs
index 8183f3bc1..0a7090ac0 100644
--- a/src/lib/scriptengine/scriptengine.qbs
+++ b/src/lib/scriptengine/scriptengine.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.File
 import qbs.FileInfo
 import qbs.Probes
diff --git a/src/libexec/libexec.qbs b/src/libexec/libexec.qbs
index a43e26157..edf081487 100644
--- a/src/libexec/libexec.qbs
+++ b/src/libexec/libexec.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     references: [
         "qbs_processlauncher/qbs_processlauncher.qbs",
diff --git a/src/libexec/qbs_processlauncher/qbs_processlauncher.qbs b/src/libexec/qbs_processlauncher/qbs_processlauncher.qbs
index 7aa7d3fc0..5be05163f 100644
--- a/src/libexec/qbs_processlauncher/qbs_processlauncher.qbs
+++ b/src/libexec/qbs_processlauncher/qbs_processlauncher.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.FileInfo
 
 QbsProduct {
diff --git a/src/packages/archive/archive.qbs b/src/packages/archive/archive.qbs
index 430f1ff15..d1875a1ac 100644
--- a/src/packages/archive/archive.qbs
+++ b/src/packages/archive/archive.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.FileInfo
 import qbs.ModUtils
 import qbs.Process
diff --git a/src/packages/chocolatey/chocolatey.qbs b/src/packages/chocolatey/chocolatey.qbs
index e878f8e0d..2ea79e3ff 100644
--- a/src/packages/chocolatey/chocolatey.qbs
+++ b/src/packages/chocolatey/chocolatey.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.Environment
 import qbs.File
 import qbs.FileInfo
diff --git a/src/packages/packages.qbs b/src/packages/packages.qbs
index aa740aafe..d2b88ccfe 100644
--- a/src/packages/packages.qbs
+++ b/src/packages/packages.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     references: [
         "archive/archive.qbs",
diff --git a/src/plugins/generator/clangcompilationdb/clangcompilationdb.qbs b/src/plugins/generator/clangcompilationdb/clangcompilationdb.qbs
index 741d6dbf0..89f7c84b9 100644
--- a/src/plugins/generator/clangcompilationdb/clangcompilationdb.qbs
+++ b/src/plugins/generator/clangcompilationdb/clangcompilationdb.qbs
@@ -1,4 +1,3 @@
-import qbs
 import "../../qbsplugin.qbs" as QbsPlugin
 
 QbsPlugin {
diff --git a/src/plugins/generator/iarew/iarew.qbs b/src/plugins/generator/iarew/iarew.qbs
index 82c95ea5d..cf1af83b8 100644
--- a/src/plugins/generator/iarew/iarew.qbs
+++ b/src/plugins/generator/iarew/iarew.qbs
@@ -1,4 +1,3 @@
-import qbs
 import "../../qbsplugin.qbs" as QbsPlugin
 
 QbsPlugin {
diff --git a/src/plugins/generator/keiluv/keiluv.qbs b/src/plugins/generator/keiluv/keiluv.qbs
index 65f8fa029..6074380b4 100644
--- a/src/plugins/generator/keiluv/keiluv.qbs
+++ b/src/plugins/generator/keiluv/keiluv.qbs
@@ -1,4 +1,3 @@
-import qbs
 import "../../qbsplugin.qbs" as QbsPlugin
 
 QbsPlugin {
diff --git a/src/plugins/generator/makefilegenerator/makefilegenerator.qbs b/src/plugins/generator/makefilegenerator/makefilegenerator.qbs
index baabc43e3..8d61defe1 100644
--- a/src/plugins/generator/makefilegenerator/makefilegenerator.qbs
+++ b/src/plugins/generator/makefilegenerator/makefilegenerator.qbs
@@ -1,4 +1,3 @@
-import qbs
 import "../../qbsplugin.qbs" as QbsPlugin
 
 QbsPlugin {
diff --git a/src/plugins/generator/visualstudio/visualstudio.qbs b/src/plugins/generator/visualstudio/visualstudio.qbs
index dcb165d55..718c8523e 100644
--- a/src/plugins/generator/visualstudio/visualstudio.qbs
+++ b/src/plugins/generator/visualstudio/visualstudio.qbs
@@ -1,4 +1,3 @@
-import qbs
 import "../../qbsplugin.qbs" as QbsPlugin
 
 QbsPlugin {
diff --git a/src/plugins/plugins.qbs b/src/plugins/plugins.qbs
index ee101f60e..55fafe90a 100644
--- a/src/plugins/plugins.qbs
+++ b/src/plugins/plugins.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     name: "qbs plugins"
     references: [
diff --git a/src/plugins/qbsplugin.qbs b/src/plugins/qbsplugin.qbs
index b37fffe81..b4721198f 100644
--- a/src/plugins/qbsplugin.qbs
+++ b/src/plugins/qbsplugin.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.FileInfo
 
 QbsProduct {
diff --git a/src/plugins/scanner/cpp/cpp.qbs b/src/plugins/scanner/cpp/cpp.qbs
index 93a64e7cd..a274e0bba 100644
--- a/src/plugins/scanner/cpp/cpp.qbs
+++ b/src/plugins/scanner/cpp/cpp.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import "../../qbsplugin.qbs" as QbsPlugin
 
 QbsPlugin {
diff --git a/src/plugins/scanner/qt/qt.qbs b/src/plugins/scanner/qt/qt.qbs
index a6aea1c33..94144665c 100644
--- a/src/plugins/scanner/qt/qt.qbs
+++ b/src/plugins/scanner/qt/qt.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import "../../qbsplugin.qbs" as QbsPlugin
 
 QbsPlugin {
diff --git a/src/shared/bundledqt/bundledqt.qbs b/src/shared/bundledqt/bundledqt.qbs
index c6f3ebbf8..e0f79df59 100644
--- a/src/shared/bundledqt/bundledqt.qbs
+++ b/src/shared/bundledqt/bundledqt.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.File
 import qbs.FileInfo
 import qbs.Utilities
diff --git a/src/shared/json/json.qbs b/src/shared/json/json.qbs
index e58c30caf..f5b2517a6 100644
--- a/src/shared/json/json.qbs
+++ b/src/shared/json/json.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 QbsStaticLibrary {
     name: "qbsjson"
     files: [
diff --git a/src/src.qbs b/src/src.qbs
index ae58f41ae..757a16878 100644
--- a/src/src.qbs
+++ b/src/src.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     references: [
         "app/apps.qbs",