diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-04-11 16:06:54 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-04-12 15:18:06 +0000 |
| commit | 5eb3f70640edb9f1291e97c2ece7d46614a2bf30 (patch) | |
| tree | a4edb88a0004d04bc831b2f9ac9cd6ebf938c31e | |
| parent | bf0a3750e0845eeba3814a4f16c20d112181e280 (diff) | |
| download | qbs-5eb3f70640edb9f1291e97c2ece7d46614a2bf30.tar.gz | |
Do not try to generate FwdHeaders when not using bundled Qt.Script
Apparently, if the submodule is not present, the Rule is not invoked at
all, but it fails on Windows when submodule is there but Perl is not
found in PATH
Change-Id: I3edb4d3679f4528f05996c630c55c052c8202369
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | src/lib/scriptengine/scriptengine.qbs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/lib/scriptengine/scriptengine.qbs b/src/lib/scriptengine/scriptengine.qbs index bb9984999..3225ceaac 100644 --- a/src/lib/scriptengine/scriptengine.qbs +++ b/src/lib/scriptengine/scriptengine.qbs @@ -383,6 +383,13 @@ Project { Product { type: ["hpp"] name: "QtScriptFwdHeaders" + condition: qbsbuildconfig.useBundledQtScript || !Qt.script.present + Depends { name: "qbsbuildconfig" } + Depends { + name: "Qt.script" + condition: !qbsbuildconfig.useBundledQtScript + required: false + } Depends { name: "Qt.core" } Group { files: [ |