summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--examples/examples.qbs1
-rw-r--r--qbs.qbs6
-rw-r--r--share/share.qbs6
-rw-r--r--static.pro4
4 files changed, 14 insertions, 3 deletions
diff --git a/examples/examples.qbs b/examples/examples.qbs
index bea9e3139..7eb5f70f8 100644
--- a/examples/examples.qbs
+++ b/examples/examples.qbs
@@ -1,7 +1,6 @@
import qbs
Project {
- condition: withExamples
references: [
"cocoa-application/CocoaApplication.qbs",
"collidingmice/collidingmice.qbs",
diff --git a/qbs.qbs b/qbs.qbs
index 31fb6e056..d5de22ed4 100644
--- a/qbs.qbs
+++ b/qbs.qbs
@@ -18,9 +18,13 @@ Project {
references: [
"doc/doc.qbs",
- "examples/examples.qbs",
"share/share.qbs",
"src/src.qbs",
"tests/auto/auto.qbs"
]
+
+ SubProject {
+ filePath: "examples/examples.qbs"
+ condition: project.withExamples
+ }
}
diff --git a/share/share.qbs b/share/share.qbs
index 66fc5f4d4..1086dede5 100644
--- a/share/share.qbs
+++ b/share/share.qbs
@@ -9,6 +9,12 @@ Product {
qbs.installDir: project.resourcesInstallDir + "/share"
}
+ Group {
+ files: "../examples"
+ qbs.install: true
+ qbs.installDir: project.resourcesInstallDir + "/share/qbs"
+ }
+
Transformer {
inputs: "qbs"
Artifact {
diff --git a/static.pro b/static.pro
index 880bf05dd..34548c0c0 100644
--- a/static.pro
+++ b/static.pro
@@ -85,4 +85,6 @@ share.files = share/qbs
else: \
installPrefix = $${QBS_INSTALL_PREFIX}
share.path = $${installPrefix}/share
-INSTALLS += share
+examples.files = examples
+examples.path = $${share.path}/qbs
+INSTALLS += share examples