diff options
| author | Akseli Salovaara <akseli.salovaara@qt.io> | 2019-03-13 09:45:12 +0200 |
|---|---|---|
| committer | Akseli Salovaara <akseli.salovaara@qt.io> | 2019-03-13 12:11:42 +0000 |
| commit | e8291211f819a2add849ae8a2c3243914f8cafd2 (patch) | |
| tree | b42576f82b8a1ebb69d8fc5e4a05e6390702e1f2 | |
| parent | 1124cbb35ac8dea80af851cdbda54748cb9a5b36 (diff) | |
Restore MINGW730_DIR variable to MinGW 32-bit tools repository configs
When fixing MinGW 32-bit and 64-bit toolchain path issues setenv.bat
MINGW730_DIR variable was replaced with MINGW730_32_DIR and
MINGW730_64_DIR variables. Restore MINGW730_DIR variable to MinGW 32-bit
tools repository configs in order to avoid breaking qtenv2.bat path with
already published Qt versions with MinGW 7.3.0 32-bit.
Task-number: QTBUG-73783
Change-Id: I55f8f4a7f2d942470b0abc4a918e70488715c110
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| -rw-r--r-- | packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.win32_mingw730/meta/installscript.qs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.win32_mingw730/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.win32_mingw730/meta/installscript.qs index f23c74158..79821af29 100644 --- a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.win32_mingw730/meta/installscript.qs +++ b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.win32_mingw730/meta/installscript.qs @@ -31,7 +31,7 @@ function Component() { installer.valueChanged.connect( this, Component.prototype.reactOnTargetDirChange ); - // set the default values to MINGW730_32_DIR + // set the default values to MINGW730_DIR Component.prototype.reactOnTargetDirChange("TargetDir", installer.value("TargetDir")); } @@ -39,7 +39,7 @@ Component.prototype.reactOnTargetDirChange = function(key, value) { if (key == "TargetDir") { var path = value + "%TARGET_INSTALL_DIR%"; - installer.setValue("MINGW730_32_DIR", path.replace(/\\/g, "/")); + installer.setValue("MINGW730_DIR", path.replace(/\\/g, "/")); } } @@ -61,7 +61,7 @@ Component.prototype.createOperations = function() ["{0,2}", "@SDKToolBinary@", "addTC", "--id", tcId + ".gcc", "--name", "MinGW 7.3.0 32-bit for C", - "--path", "@MINGW730_32_DIR@/bin/gcc.exe", + "--path", "@MINGW730_DIR@/bin/gcc.exe", "--abi", "x86-windows-msys-pe-32bit", "--language", "1", "--supportedAbis", "x86-windows-msys-pe-32bit", @@ -72,7 +72,7 @@ Component.prototype.createOperations = function() ["{0,2}", "@SDKToolBinary@", "addTC", "--id", tcId + ".g++", "--name", "MinGW 7.3.0 32-bit for C++", - "--path", "@MINGW730_32_DIR@/bin/g++.exe", + "--path", "@MINGW730_DIR@/bin/g++.exe", "--abi", "x86-windows-msys-pe-32bit", "--language", "2", "--supportedAbis", "x86-windows-msys-pe-32bit", @@ -83,7 +83,7 @@ Component.prototype.createOperations = function() ["{0,2}", "@SDKToolBinary@", "addDebugger", "--id", dbgId, "--name", "GNU gdb 8.1 for MinGW 7.3.0 32-bit", - "--binary", "@MINGW730_32_DIR@/bin/gdb.exe", + "--binary", "@MINGW730_DIR@/bin/gdb.exe", "--abis", "x86-windows-msys-pe-32bit", "--engine", "1", "UNDOEXECUTE", @@ -91,7 +91,7 @@ Component.prototype.createOperations = function() component.addOperation("Execute", ["{0,4}", "@SDKToolBinary@", "addKeys", - "android", "MakeExtraSearchDirectory", "QString:@MINGW730_32_DIR@/bin"]); + "android", "MakeExtraSearchDirectory", "QString:@MINGW730_DIR@/bin"]); } catch( e ) { print( e ); } |