aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIvan Komissarov <abbapoh@gmail.com>2021-02-11 19:51:05 +0100
committerIvan Komissarov <ABBAPOH@gmail.com>2021-02-12 20:30:29 +0000
commit749cadaff6f299d32783b0a8e1e33551b80247f0 (patch)
tree1d3fe14ba83d555079a66dec68c7e53b821b0e79 /src
parent54a768cbf08d0b37102b6980f28a39a5f3412751 (diff)
Allow to overwrite path to Perl in scriptengine.qbs
Can be useful if perl is not in PATH e.g. on Windows Change-Id: Id3d245588fea5dd3ca2579f418f2e6fe43151994 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/lib/scriptengine/scriptengine.qbs8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/scriptengine/scriptengine.qbs b/src/lib/scriptengine/scriptengine.qbs
index 660b64a82..bb9984999 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 {
@@ -389,6 +390,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 +419,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,