diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-06-07 14:41:53 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-06-08 12:53:48 +0000 |
| commit | 2ba93a4719272c7da5cddf2d4867bf5732cf8f11 (patch) | |
| tree | bd4a01f81ce4ff3f4efb91a76347fd58cd13bd9f /src/lib/corelib/corelib.qbs | |
| parent | c18c082406152ede2bcb39c423ca22fbc9864cf1 (diff) | |
Fix Windows build with QtScript-less Qt
As we're building our own QtScript statically, we must override the
export macros of QtScript.
Change-Id: I9395e59cfcc1905b7b248b81277ec5fcfed9059f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/corelib/corelib.qbs')
| -rw-r--r-- | src/lib/corelib/corelib.qbs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs index fd25d30e0..08733b624 100644 --- a/src/lib/corelib/corelib.qbs +++ b/src/lib/corelib/corelib.qbs @@ -17,7 +17,9 @@ QbsLibrary { Depends { condition: qbsbuildconfig.enableProjectFileUpdates; name: "Qt.gui" } Depends { condition: staticBuild; productTypes: ["qbsplugin"] } name: "qbscore" - cpp.includePaths: base.concat([ + property stringList bundledQtScriptIncludes: qbsbuildconfig.useBundledQtScript + || !Qt.script.present ? qbsscriptengine.includePaths : [] + cpp.includePaths: base.concat(bundledQtScriptIncludes).concat([ ".", "../.." // for the plugin headers ]) |