diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-05-09 13:52:33 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-05-09 13:52:33 +0200 |
| commit | 75e308f6eecf56d59ecec31752077785d2a0a29e (patch) | |
| tree | 39e946d1160e81afd8da0aa8f8f383d495a38232 /src/lib/corelib/corelib.qbs | |
| parent | 15751999bbfa66015f48bbdde2fea2d4e8fed61a (diff) | |
| parent | c4e4bb9604a884ca5966ebab19e510a1966f798a (diff) | |
Merge remote-tracking branch 'origin/1.11'
Change-Id: I407596d75413e43aa61e7d1fe8591f4a0f388340
Diffstat (limited to 'src/lib/corelib/corelib.qbs')
| -rw-r--r-- | src/lib/corelib/corelib.qbs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs index eff34ab51..e1fe4cf9b 100644 --- a/src/lib/corelib/corelib.qbs +++ b/src/lib/corelib/corelib.qbs @@ -497,6 +497,6 @@ QbsLibrary { } Export { Depends { name: "cpp" } - cpp.defines: product.projectFileUpdateDefines + cpp.defines: base.concat(product.projectFileUpdateDefines) } } |