Skip to content

Commit

Permalink
Stick with Qt 5.9.5 for now instead of 5.9.6
Browse files Browse the repository at this point in the history
Fixes regression in restoring of QMainWindow state (QTBUG-68939).

Closes mapeditor#1980
  • Loading branch information
bjorn committed Jul 19, 2018
1 parent 3f14c3e commit 47711af
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ matrix:
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
before_install:
- eval "${MATRIX_EVAL}"
- sudo add-apt-repository --yes ppa:beineri/opt-qt596-trusty
- sudo add-apt-repository --yes ppa:beineri/opt-qt595-trusty
- sudo apt-get update -qq
- sudo apt-get -y install qt59base qt59script qt59svg qt59imageformats qt59tools binutils zlib1g-dev
- source /opt/qt59/bin/qt59-env.sh
Expand All @@ -50,7 +50,7 @@ matrix:
- qbs --version
- qbs setup-toolchains --detect
- qbs setup-qt --detect
- qbs config defaultProfile qt-5-9-6
- qbs config defaultProfile qt-5-9-5
- qbs install --install-root Tiled/usr config:release projects.Tiled.version:$TILED_VERSION
- cp LICENSE* COPYING *md Tiled/
after_success:
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ environment:
my_secret:
secure: +3IhWT10lCSC4GE4gGfWt8WiZdIXuMUfaImgvQUullg=
matrix:
- QTDIR: C:\Qt\5.9\msvc2013_64
- QTDIR: C:\Qt\5.9.5\msvc2013_64
PUSH_RELEASE: true
TILED_ITCH_CHANNEL: windows-64bit
- QTDIR: C:\Qt\5.9\mingw53_32
- QTDIR: C:\Qt\5.9.5\mingw53_32
MINGW: C:\Qt\Tools\mingw530_32
PUSH_RELEASE: true
TILED_ITCH_CHANNEL: windows-32bit
Expand Down

0 comments on commit 47711af

Please sign in to comment.