diff options
| author | David Schulz <david.schulz@qt.io> | 2019-04-24 13:01:05 +0200 |
|---|---|---|
| committer | David Schulz <david.schulz@qt.io> | 2019-04-25 04:46:34 +0000 |
| commit | f7844c762273d08f113e24e9d4a5c20fa42baa64 (patch) | |
| tree | 4dd7b2c03d80eb74bcf517ecb2d259e847dc9cd8 | |
| parent | b76aafc5289716caf8c1dbbf225d9470950beed1 (diff) | |
Fix Windows build with QtScript-less Qt again
remove \r\n or \n from the qmake query output not just \r or \n
Change-Id: I4cd12fb5e708b28eedc43381a8d67f9e54c82d9f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | src/lib/scriptengine/scriptengine.qbs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/scriptengine/scriptengine.qbs b/src/lib/scriptengine/scriptengine.qbs index 77e6ef7d2..4c03d5e36 100644 --- a/src/lib/scriptengine/scriptengine.qbs +++ b/src/lib/scriptengine/scriptengine.qbs @@ -401,7 +401,7 @@ Project { var p = new Process(); if (p.exec(qmake, ["-query", "QT_HOST_BINS/src"]) !== 0) throw new Error("Error while querying qmake."); - syncQtPath = FileInfo.joinPaths(p.readStdOut().replace(/[\r\n]/, ''), + syncQtPath = FileInfo.joinPaths(p.readStdOut().replace(/\r?\n/, ''), "syncqt.pl"); } var qtScriptSrcPath = FileInfo.cleanPath( |