diff options
author | Iikka Eklund <iikka.eklund@qt.io> | 2016-06-15 14:41:56 +0300 |
---|---|---|
committer | Iikka Eklund <iikka.eklund@qt.io> | 2016-06-20 09:31:06 +0000 |
commit | b24ce875cfc77b948c843a38d7b78ee26114161b (patch) | |
tree | 1a2003ea84e0a4b3c0ff2ab237140cd4de278e32 | |
parent | ad0c6f2e76be683389e591c647d9c40b7d7d0fc5 (diff) |
Fix MinGW path in qtenv2.batv5.6.1-1-packaging
Use installer.value() to obtain the value correctly as @<key>@ is not
working in this context.
Change-Id: I0d586ad783f5c980ec61a68074bd4c8fd2384476
Task-number: QTBUG-54111
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
-rw-r--r-- | packaging-tools/configurations/pkg_templates/pkg_56/qt.56.win32_mingw49/meta/installscript.qs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packaging-tools/configurations/pkg_templates/pkg_56/qt.56.win32_mingw49/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/pkg_56/qt.56.win32_mingw49/meta/installscript.qs index 7f2f6c392..115ece2e2 100644 --- a/packaging-tools/configurations/pkg_templates/pkg_56/qt.56.win32_mingw49/meta/installscript.qs +++ b/packaging-tools/configurations/pkg_templates/pkg_56/qt.56.win32_mingw49/meta/installscript.qs @@ -48,7 +48,7 @@ function createShortcuts() var batchFileName = component_root_path + "\\" + "bin" + "\\" + "qtenv2.bat"; var contentString = "echo off\r\n"; contentString += "echo Setting up environment for Qt usage...\r\n"; - contentString += "set PATH=" + component_root_path + "\\bin;@MINGW492_DIR@\\bin;%PATH%\r\n"; + contentString += "set PATH=" + component_root_path + "\\bin;" + installer.value("MINGW492_DIR") + "\\bin;%PATH%\r\n"; contentString += "cd /D " + component_root_path + "\r\n"; //contentString += "echo Remember to call vcvarsall.bat to complete environment setup!\r\n"; // Dump batch file |