diff options
| author | John Thacker <johnthacker@gmail.com> | 2021-01-08 08:12:23 -0500 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-01-11 21:32:22 +0000 |
| commit | d612e197673701ddc90e15c6f0e19196167e0cc9 (patch) | |
| tree | c8f3064727a885b3a2855f2340fd491577ba1efd /tools | |
| parent | c523356c3babf8038dfb3090b23945085696c4e9 (diff) | |
macos-setup: Allow installing QT 5.14
Allow QT version 5.14.x to be installed (if specified as a variable
on the command line.) Remove the ability to install 5.2.x, as QT 5.3
has been the minimum required version since the Wireshark 3.4 branch.
Note that QT no longer providers offline installers for the free releases
of 5.15 and later, so we'll have to come up with a different method.
(See http://download.qt.io/archive/qt/5.15/5.15.0/OFFLINE_README.txt
and https://www.qt.io/blog/qt-offering-changes-2020 )
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/macos-setup.sh | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/tools/macos-setup.sh b/tools/macos-setup.sh index 798c7971fa..298b5a9d12 100755 --- a/tools/macos-setup.sh +++ b/tools/macos-setup.sh @@ -854,7 +854,7 @@ install_qt() { # 5.2.0: qt-mac-opensource-{version}.dmg # 5.2.1: qt-opensource-mac-x64-clang-{version}.dmg # 5.3 - 5.8: qt-opensource-mac-x64-clang-{version}.dmg - # 5.9 - 5.13: qt-opensource-mac-x64-{version}.dmg + # 5.9 - 5.14: qt-opensource-mac-x64-{version}.dmg # case $QT_MAJOR_VERSION in @@ -865,28 +865,15 @@ install_qt() { 5*) case $QT_MINOR_VERSION in - 0|1) + 0|1|2) echo "Qt $QT_VERSION" is too old 1>&2 ;; - 2) - case $QT_DOTDOT_VERSION in - - 0) - QT_VOLUME=qt-mac-opensource-$QT_VERSION - ;; - - 1) - QT_VOLUME=qt-opensource-mac-x64-clang-$QT_VERSION - ;; - esac - ;; - 3|4|5|6|7|8) QT_VOLUME=qt-opensource-mac-x64-clang-$QT_VERSION ;; - 9|10|11|12|13) + 9|10|11|12|13|14) QT_VOLUME=qt-opensource-mac-x64-$QT_VERSION ;; esac @@ -919,7 +906,7 @@ uninstall_qt() { # 5.2.0: qt-mac-opensource-{version}.dmg # 5.2.1: qt-opensource-mac-x64-clang-{version}.dmg # 5.3 - 5.8: qt-opensource-mac-x64-clang-{version}.dmg - # 5.9 - 5.13: qt-opensource-mac-x64-{version}.dmg + # 5.9 - 5.14: qt-opensource-mac-x64-{version}.dmg # installed_qt_major_version="`expr $installed_qt_version : '\([0-9][0-9]*\).*'`" installed_qt_minor_version="`expr $installed_qt_version : '[0-9][0-9]*\.\([0-9][0-9]*\).*'`" @@ -934,7 +921,7 @@ uninstall_qt() { case $installed_qt_minor_version in 0|1) - installed_qt_volume=qt-mac-opensource-$installed_qt_version-clang-offline.dmg + echo "Qt $installed_qt_version" is too old 1>&2 ;; 2) |