diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2021-09-24 08:59:21 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2021-09-27 13:53:50 +0300 |
| commit | 85397eda94cc039ca70675a1e1335664ebb24558 (patch) | |
| tree | 408e2333006dfa8a7b9825bdd091026969a5e5c5 | |
| parent | a67a9e4743dcc715ea24b780286fcc0632cee60b (diff) | |
qbsp: no need to patch qt.conf in windows
qt.conf is now using relative paths, so there is no need to
patch it anymore on windows.
Task-number: 6.2
Change-Id: I2344420145d7873cca2337881d17607874f63a59
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 2094ae0a994485f307dcd8c49d7487200cdf4503)
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
| -rw-r--r-- | meta-boot2qt/files/qbsp/toolchain_installscript.qs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/meta-boot2qt/files/qbsp/toolchain_installscript.qs b/meta-boot2qt/files/qbsp/toolchain_installscript.qs index a89e9e0b..00570dc1 100644 --- a/meta-boot2qt/files/qbsp/toolchain_installscript.qs +++ b/meta-boot2qt/files/qbsp/toolchain_installscript.qs @@ -52,11 +52,6 @@ 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 { - path = path.replace(/\\/g,"/"); - component.addOperation("Replace", - path + "/sysroots/" + hostSysroot + "/usr/bin/qt.conf", - sdkPath, path); } var basecomponent = component.name.substring(0, component.name.lastIndexOf(".")); var toolchainId = "ProjectExplorer.ToolChain.Gcc:" + component.name; |