diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2019-04-19 01:54:07 +0100 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2019-04-19 17:30:04 +0000 |
| commit | e60c14e376788f7e0bdf5124235dc4e0a9b49c5e (patch) | |
| tree | 33b55fb628ad935cebb34bb9119d15be211995c8 | |
| parent | 8c2621754803ae0c0dca92f423c43222c1f61d9e (diff) | |
travis: update to Qt 5.12.3 to fix Windows builds
The Qt installer always seems to install the latest version while the
version was assumed to be fixed. This configuration will likely break
again with the next Qt update, but it fixes the current Windows builds.
Change-Id: Icf4a8fdf10c15e6f6a6eb0451ff30662da613567
Reviewed-on: https://code.wireshark.org/review/32893
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | tools/qt-installer-windows.qs | 6 | ||||
| -rwxr-xr-x | tools/travis-install-qt-windows.sh | 3 |
3 files changed, 7 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 4a5d9d9ef2..6a8898d07d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,7 +61,7 @@ matrix: env: - PLATFORM: x64 - WIRESHARK_BASE_DIR: C:/wireshark-libs - - QT5_BASE_DIR: C:/Qt/5.12.0/msvc2017_64 + - QT5_BASE_DIR: C:/Qt/5.12.3/msvc2017_64 cache: directories: - travis-cache @@ -72,7 +72,7 @@ matrix: env: - PLATFORM: Win32 - WIRESHARK_BASE_DIR: C:/wireshark-libs - - QT5_BASE_DIR: C:/Qt/5.12.0/msvc2017 + - QT5_BASE_DIR: C:/Qt/5.12.3/msvc2017 cache: directories: - travis-cache diff --git a/tools/qt-installer-windows.qs b/tools/qt-installer-windows.qs index da9c696a95..8164790b74 100644 --- a/tools/qt-installer-windows.qs +++ b/tools/qt-installer-windows.qs @@ -10,12 +10,12 @@ // .\qt-unified-windows-x86-3.0.4-online.exe --verbose --script tools\qt-installer-windows.qs // Look for Name elements in -// https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/qt5_5120/Updates.xml +// https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/qt5_5123/Updates.xml // Unfortunately it is not possible to disable deps like qt.tools.qtcreator var INSTALL_COMPONENTS = [ installer.environmentVariable("PLATFORM") == "x64" ? - "qt.qt5.5120.win64_msvc2017_64" : - "qt.qt5.5120.win32_msvc2017", + "qt.qt5.5123.win64_msvc2017_64" : + "qt.qt5.5123.win32_msvc2017", ]; function Controller() { diff --git a/tools/travis-install-qt-windows.sh b/tools/travis-install-qt-windows.sh index a94a0ae6a8..2d619f3dda 100755 --- a/tools/travis-install-qt-windows.sh +++ b/tools/travis-install-qt-windows.sh @@ -24,4 +24,5 @@ echo "Installing..." (cat ~/qt-installer-output.txt; exit 1) printf 'Installation size: ' -du -sm "$QT5_BASE_DIR" +du -sm "$QT5_BASE_DIR" 2>&1 || + (cat ~/qt-installer-output.txt; exit 1) |