diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2021-10-05 11:44:09 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2021-10-06 08:51:32 +0300 |
commit | 9bdb79eb0db54e11087e8823ca57ad95b2c76852 (patch) | |
tree | 4134830736705d577923acd176086eb5387613d4 /meta-boot2qt/files/qbsp | |
parent | c48cfeabf051ea429c53f527e9a472d43188b207 (diff) |
qbsp: replace windows path separators
Bring back workaround for issue where IFW may give out paths
that contain Windows path separators. This was done already
previously, but it was hidden in the qt.conf patching that
was subsequently removed.
Task-number: QTIFW-2344
Pick-to: 6.2
Change-Id: I1b2223dc4bfa9e1d9086eb624d750cb9dce907ae
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'meta-boot2qt/files/qbsp')
-rw-r--r-- | meta-boot2qt/files/qbsp/toolchain_installscript.qs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta-boot2qt/files/qbsp/toolchain_installscript.qs b/meta-boot2qt/files/qbsp/toolchain_installscript.qs index 00570dc1..f26de07b 100644 --- a/meta-boot2qt/files/qbsp/toolchain_installscript.qs +++ b/meta-boot2qt/files/qbsp/toolchain_installscript.qs @@ -52,6 +52,9 @@ Component.prototype.createOperations = function() component.addOperation("Execute", "{0}", "chmod", "+x", script); component.addOperation("Execute", "{0}", script, "-y", "-d", path, "UNDOEXECUTE", "rm", "-rf", path); component.addOperation("Execute", "{0}", "/bin/rm", script); + } else { + // workaround for QTIFW-2344 + path = path.replace(/\\/g ,"/"); } var basecomponent = component.name.substring(0, component.name.lastIndexOf(".")); var toolchainId = "ProjectExplorer.ToolChain.Gcc:" + component.name; |