diff options
| author | Joerg Mayer <jmayer@loplof.de> | 2019-09-10 12:12:31 +0200 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2019-10-08 15:36:52 +0000 |
| commit | 0cadd7e4ed7c463a24e05aa450168c04eae53545 (patch) | |
| tree | ca068c762f22d799bb8c7b372c2e2218566e27d9 | |
| parent | 723433f750a218c65c7e9bf5aa0bdbdcf54e452c (diff) | |
Update qt 5.12.1 -> 5.12.4 and update a comment (twice)
Change-Id: I2eab2f73305918a354b8b9b9c5616ef290a40284
Reviewed-on: https://code.wireshark.org/review/34733
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
| -rwxr-xr-x | tools/macos-setup.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/macos-setup.sh b/tools/macos-setup.sh index 37a31f4395..716da9fb03 100755 --- a/tools/macos-setup.sh +++ b/tools/macos-setup.sh @@ -113,7 +113,7 @@ LIBGCRYPT_VERSION=1.7.7 # packet data pane; see, for example, Qt bugs QTBUG-31937, QTBUG-41017, # and QTBUG-43464, all of which seem to be the same bug. # -QT_VERSION=${QT_VERSION-5.12.1} +QT_VERSION=${QT_VERSION-5.12.4} if [ "$QT_VERSION" ]; then QT_MAJOR_VERSION="`expr $QT_VERSION : '\([0-9][0-9]*\).*'`" @@ -783,7 +783,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.10: qt-opensource-mac-x64-{version}.dmg + # 5.9 - 5.13: qt-opensource-mac-x64-{version}.dmg # case $QT_MAJOR_VERSION in @@ -848,7 +848,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.10: qt-opensource-mac-x64-{version}.dmg + # 5.9 - 5.13: 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]*\).*'`" |