diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-06-08 14:55:29 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-06-08 15:13:47 +0200 |
| commit | 073fda0ab536b5610ff1b9191db582791552509e (patch) | |
| tree | 16f0bbacc116e93778e9490ba2c2d9efff738d35 /src/lib/scriptengine/scriptengine.qbs | |
| parent | 9349866b37118db9179d1f0689e872ca1260f040 (diff) | |
| parent | 5f71b2220f9ff6838799c407972309bff1e8fc96 (diff) | |
Merge 1.12 into master
Change-Id: I0c914674c0728a7f7bc70fd9608914b95ef55a30
Diffstat (limited to 'src/lib/scriptengine/scriptengine.qbs')
| -rw-r--r-- | src/lib/scriptengine/scriptengine.qbs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/lib/scriptengine/scriptengine.qbs b/src/lib/scriptengine/scriptengine.qbs index c92bc1954..77e6ef7d2 100644 --- a/src/lib/scriptengine/scriptengine.qbs +++ b/src/lib/scriptengine/scriptengine.qbs @@ -17,12 +17,18 @@ Project { type: ["staticlibrary"] name: "qbsscriptengine" + generatePkgConfigFile: false + generateQbsModule: false + property bool useSystemMalloc: !qbs.targetOS.contains("macos") && !qbs.targetOS.contains("unix") property string qtscriptPath: "../../shared/qtscript/src/" cpp.includePaths: { - var result = base.concat(["."]); + var result = base.concat( + ".", + "include" + ); var jscBaseDir = qtscriptPath + "3rdparty/javascriptcore"; result.push(jscBaseDir); @@ -355,7 +361,8 @@ Project { Export { Depends { name: "QtScriptFwdHeaders" } Depends { name: "cpp" } - cpp.includePaths: QtScriptFwdHeaders.publicIncludePaths + property stringList includePaths: [product.sourceDirectory + "/include"] + .concat(QtScriptFwdHeaders.publicIncludePaths) Properties { condition: qbs.targetOS.contains("unix") cpp.dynamicLibraries: base.concat(["pthread"]) |