aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2018-05-02 10:56:39 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2018-05-02 09:21:08 +0000
commitfaa9adb87eeae49133437c03260e1fc80222b759 (patch)
tree4e84ea9324bc8a2d4452f5ba618be8c678b4dd73
parentece99a4c5f8710b11cd17ff48f4fc2d5ced645b3 (diff)
qbs build: Fix core lib's Export item
We overwrote the defines from QbsLibrary.qbs, breaking static builds. Task-number: QBS-1230 Change-Id: Ia146e39f6278bf21c2415008c91520399065b20d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--src/lib/corelib/corelib.qbs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs
index 0b4c95f54..d3787e526 100644
--- a/src/lib/corelib/corelib.qbs
+++ b/src/lib/corelib/corelib.qbs
@@ -474,6 +474,6 @@ QbsLibrary {
}
Export {
Depends { name: "cpp" }
- cpp.defines: product.projectFileUpdateDefines
+ cpp.defines: base.concat(product.projectFileUpdateDefines)
}
}