From f7844c762273d08f113e24e9d4a5c20fa42baa64 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Wed, 24 Apr 2019 13:01:05 +0200 Subject: 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 --- src/lib/scriptengine/scriptengine.qbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/lib/scriptengine') 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( -- cgit v1.2.3