diff options
| author | Akseli Salovaara <akseli.salovaara@qt.io> | 2018-02-09 17:32:12 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2018-02-09 16:13:28 +0000 |
| commit | 26bd4429d1137af2fe609da7767a59a0c9171d0a (patch) | |
| tree | ce165320d6aced7c6454ead2c537bc0e021617ca | |
| parent | 5beabd94248de5c863ae192193466a566ddc7800 (diff) | |
Fix logical operator error on Xcode version check
Change-Id: Ie42e252908061cec47c004468bd65a10d874c612
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2 files changed, 2 insertions, 4 deletions
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5101/qt.qt5.5101.clang_64/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/pkg_qt5_5101/qt.qt5.5101.clang_64/meta/installscript.qs index 95ba1a378..23ead48d6 100644 --- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5101/qt.qt5.5101.clang_64/meta/installscript.qs +++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5101/qt.qt5.5101.clang_64/meta/installscript.qs @@ -29,12 +29,11 @@ // constructor function Component() { - if (installer.value("os") == "mac") { var xcodeVersion = installer.execute("/usr/bin/xcodebuild", new Array("-version"))[0]; if (xcodeVersion) { var version = xcodeVersion.replace( /\D+/g, ''); - if (parseInt(version) >= parseInt(820)) { + if (parseInt(version) <= parseInt(820)) { QMessageBox["warning"]("XcodeVersionError", qsTr("You need to update Xcode to newer version!"), qsTr("It is recommeneded to have Xcode version greater than 8.2 for Qt5.10 compilations with clang.")); diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.clang_64/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.clang_64/meta/installscript.qs index 82809fc2e..8bb9163ec 100644 --- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.clang_64/meta/installscript.qs +++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.clang_64/meta/installscript.qs @@ -29,12 +29,11 @@ // constructor function Component() { - if (installer.value("os") == "mac") { var xcodeVersion = installer.execute("/usr/bin/xcodebuild", new Array("-version"))[0]; if (xcodeVersion) { var version = xcodeVersion.replace( /\D+/g, ''); - if (parseInt(version) >= parseInt(820)) { + if (parseInt(version) <= parseInt(820)) { QMessageBox["warning"]("XcodeVersionError", qsTr("You need to update Xcode to newer version!"), qsTr("It is recommeneded to have Xcode version greater than 8.2 for Qt5.11 compilations with clang.")); |