qbs build: Introduce convenience item QbsProduct.

As base product for QbsApp, QbsLibrary etc. Has little functionality
at the moment, but will get more soon.

Change-Id: I29ac78db2ff1ba109dd09a55e7593b2beeaba741
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

7 files changed, 2 insertions, 37 deletions

diff --git a/src/app/apptemplate.qbs b/src/app/apptemplate.qbs
deleted file mode 100644
index 7ebe33b2d..000000000
--- a/src/app/apptemplate.qbs
+++ /dev/null
@@ -1,29 +0,0 @@
-import qbs 1.0
-
-Product {
-    Depends { name: "qbscore" }
-    Depends { name: "cpp" }
-    Depends { name: "Qt.core" }
-    type: "application"
-    consoleApplication: true
-    destinationDirectory: "bin"
-    cpp.includePaths: [
-        "../shared",    // for the logger
-    ]
-    Group {
-        fileTagsFilter: product.type
-        qbs.install: true
-        qbs.installDir: project.appInstallDir
-    }
-    Group {
-        name: "logging"
-        prefix: "../shared/logging/"
-        files: [
-            "coloredoutput.cpp",
-            "coloredoutput.h",
-            "consolelogger.cpp",
-            "consolelogger.h"
-        ]
-    }
-}
-
diff --git a/src/app/config-ui/config-ui.qbs b/src/app/config-ui/config-ui.qbs
index 078d3d4a2..bed34673d 100644
--- a/src/app/config-ui/config-ui.qbs
+++ b/src/app/config-ui/config-ui.qbs
@@ -1,5 +1,4 @@
 import qbs 1.0
-import "../apptemplate.qbs" as QbsApp
 
 QbsApp {
     Depends { name: "Qt.widgets" }
diff --git a/src/app/config/config.qbs b/src/app/config/config.qbs
index 1f9a141c9..3ef2166d3 100644
--- a/src/app/config/config.qbs
+++ b/src/app/config/config.qbs
@@ -1,5 +1,4 @@
 import qbs 1.0
-import "../apptemplate.qbs" as QbsApp
 
 QbsApp {
     name: "qbs-config"
diff --git a/src/app/qbs-qmltypes/qbs-qmltypes.qbs b/src/app/qbs-qmltypes/qbs-qmltypes.qbs
index 8c11fd911..f7368a1a8 100644
--- a/src/app/qbs-qmltypes/qbs-qmltypes.qbs
+++ b/src/app/qbs-qmltypes/qbs-qmltypes.qbs
@@ -1,5 +1,4 @@
 import qbs 1.0
-import "../apptemplate.qbs" as QbsApp
 
 QbsApp {
     name: "qbs-qmltypes"
diff --git a/src/app/qbs-setup-qt/qbs-setup-qt.qbs b/src/app/qbs-setup-qt/qbs-setup-qt.qbs
index 3120901e0..033f046a5 100644
--- a/src/app/qbs-setup-qt/qbs-setup-qt.qbs
+++ b/src/app/qbs-setup-qt/qbs-setup-qt.qbs
@@ -1,5 +1,4 @@
 import qbs 1.0
-import "../apptemplate.qbs" as QbsApp
 
 QbsApp {
     name: "qbs-setup-qt"
diff --git a/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs b/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs
index b27f8f5a2..13bb0dd01 100644
--- a/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs
+++ b/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs
@@ -1,5 +1,4 @@
 import qbs 1.0
-import "../apptemplate.qbs" as QbsApp
 
 QbsApp {
     name: "qbs-setup-toolchains"
diff --git a/src/app/qbs/qbs.qbs b/src/app/qbs/qbs.qbs
index 2f96dde8d..afe8a2fba 100644
--- a/src/app/qbs/qbs.qbs
+++ b/src/app/qbs/qbs.qbs
@@ -1,12 +1,11 @@
 import qbs 1.0
-import "../apptemplate.qbs" as QbsApp
-import "../../../version.js" as Version
+import QbsFunctions
 
 QbsApp {
     name: "qbs_app"
     targetName: "qbs"
     cpp.defines: base.concat([
-        'QBS_VERSION="' + Version.qbsVersion() + '"',
+        'QBS_VERSION="' + QbsFunctions.qbsVersion() + '"',
         'QBS_RELATIVE_SEARCH_PATH="' + project.relativeSearchPath + '"',
         'QBS_RELATIVE_PLUGINS_PATH="' + project.relativePluginsPath + '"'
     ])