diff options
Diffstat (limited to 'src/lib/scriptengine/scriptengine.qbs')
-rw-r--r-- | src/lib/scriptengine/scriptengine.qbs | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/lib/scriptengine/scriptengine.qbs b/src/lib/scriptengine/scriptengine.qbs index 660b64a82..3225ceaac 100644 --- a/src/lib/scriptengine/scriptengine.qbs +++ b/src/lib/scriptengine/scriptengine.qbs @@ -1,6 +1,7 @@ import qbs import qbs.File import qbs.FileInfo +import qbs.Probes import qbs.Process Project { @@ -382,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: [ @@ -389,6 +397,11 @@ Project { ] fileTags: ["qtscriptheader"] } + Probes.BinaryProbe { + id: perlProbe + names: "perl" + } + property string perlPath: perlProbe.found ? perlProbe.filePath : undefined Rule { multiplex: true inputs: ["qtscriptheader"] @@ -413,7 +426,7 @@ Project { var qtScriptSrcPath = FileInfo.cleanPath( FileInfo.path(inputs["qtscriptheader"][0].filePath) + "/../../.."); console.info("qtScriptSrcPath: " + qtScriptSrcPath); - var cmd = new Command("perl", [ + var cmd = new Command(product.perlPath, [ syncQtPath, "-minimal", "-version", product.Qt.core.version, |