From b24ce875cfc77b948c843a38d7b78ee26114161b Mon Sep 17 00:00:00 2001 From: Iikka Eklund Date: Wed, 15 Jun 2016 14:41:56 +0300 Subject: Fix MinGW path in qtenv2.bat Use installer.value() to obtain the value correctly as @@ is not working in this context. Change-Id: I0d586ad783f5c980ec61a68074bd4c8fd2384476 Task-number: QTBUG-54111 Reviewed-by: Katja Marttila Reviewed-by: Jani Heikkinen --- .../pkg_templates/pkg_56/qt.56.win32_mingw49/meta/installscript.qs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3