Use the new sub-project feature in the qbs project files.

Change-Id: Ia30766b91ef28d05bc1f6109d6dedbb7d18bcf3d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

6 files changed, 50 insertions, 20 deletions

diff --git a/qbs.qbs b/qbs.qbs
index 2ba1ab228..437513770 100644
--- a/qbs.qbs
+++ b/qbs.qbs
@@ -3,27 +3,12 @@ import qbs 1.0
 Project {
     property string version: "1.0.0"
     property bool enableUnitTests: false
+
     references: [
-        "src/app/config/config.qbs",
-        "src/app/config-ui/config-ui.qbs",
-        "src/app/detect-toolchains/detect-toolchains.qbs",
-        "src/app/qbs/qbs.qbs",
-        "src/app/qbs-qmltypes/qbs-qmltypes.qbs",
-        "src/app/qbs-setup-qt/qbs-setup-qt.qbs",
-        "src/app/setupmaddeplatforms/setupmaddeplatforms.qbs",
-        "src/lib/lib.qbs",
-        "src/plugins/scanner/cpp/cpp.qbs",
-        "src/plugins/scanner/qt/qt.qbs",
+        "src/src.qbs",
         "doc/doc.qbs",
-        "tests/auto/blackbox/blackbox.qbs",
-        "tests/auto/cmdlineparser/cmdlineparser.qbs",
-    ].concat(unitTests)
-
-    property list unitTests: enableUnitTests ? [
-        "tests/auto/buildgraph/buildgraph.qbs",
-        "tests/auto/language/language.qbs",
-        "tests/auto/tools/tools.qbs"
-    ] : []
+        "tests/auto/auto.qbs"
+    ]
 
     Product {
         name: "share"
diff --git a/src/app/apps.qbs b/src/app/apps.qbs
new file mode 100644
index 000000000..e76707246
--- /dev/null
+++ b/src/app/apps.qbs
@@ -0,0 +1,13 @@
+import qbs
+
+Project {
+    references: [
+        "config/config.qbs",
+        "config-ui/config-ui.qbs",
+        "detect-toolchains/detect-toolchains.qbs",
+        "qbs/qbs.qbs",
+        "qbs-qmltypes/qbs-qmltypes.qbs",
+        "qbs-setup-qt/qbs-setup-qt.qbs",
+        "setupmaddeplatforms/setupmaddeplatforms.qbs"
+    ]
+}
diff --git a/src/lib/lib.qbs b/src/lib/lib.qbs
index e5478858b..6105c6b35 100644
--- a/src/lib/lib.qbs
+++ b/src/lib/lib.qbs
@@ -327,6 +327,6 @@ DynamicLibrary {
         Depends { name: "cpp" }
         Depends { name: "Qt"; submodules: ["script"]}
         cpp.rpaths: qbs.targetOS === "linux" ? ["$ORIGIN/../lib"] : undefined
-        cpp.includePaths: ["."]
+        cpp.includePaths: path
     }
 }
diff --git a/src/plugins/plugins.qbs b/src/plugins/plugins.qbs
new file mode 100644
index 000000000..af7ac06ce
--- /dev/null
+++ b/src/plugins/plugins.qbs
@@ -0,0 +1,8 @@
+import qbs
+
+Project {
+    references: [
+        "scanner/cpp/cpp.qbs",
+        "scanner/qt/qt.qbs"
+    ]
+}
diff --git a/src/src.qbs b/src/src.qbs
new file mode 100644
index 000000000..b377b6b77
--- /dev/null
+++ b/src/src.qbs
@@ -0,0 +1,9 @@
+import qbs
+
+Project {
+    references: [
+        "app/apps.qbs",
+        "lib/lib.qbs",
+        "plugins/plugins.qbs"
+    ]
+}
diff --git a/tests/auto/auto.qbs b/tests/auto/auto.qbs
new file mode 100644
index 000000000..63e75c791
--- /dev/null
+++ b/tests/auto/auto.qbs
@@ -0,0 +1,15 @@
+import qbs
+
+Project {
+    name: "Autotests"
+    references: [
+        "blackbox/blackbox.qbs",
+        "cmdlineparser/cmdlineparser.qbs"
+    ].concat(unitTests)
+
+    property pathList unitTests: enableUnitTests ? [
+        "buildgraph/buildgraph.qbs",
+        "language/language.qbs",
+        "tools/tools.qbs"
+    ] : []
+}