Switch to Qt 5.7 (#3718)

* Switch to Qt 5.7 * Update configure * Update .travis.yml
RedisInsight · Sep 13, 2016 · 75987af · 75987af
1 parent 52c45c1
commit 75987af
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,7 @@ install:
   fi
 - cd ./src && ./configure && cd ./../
 - if [ "$TRAVIS_OS_NAME" == "linux" ]; then
-       source /opt/qt56/bin/qt56-env.sh
+       source /opt/qt57/bin/qt57-env.sh
        ; 
   fi
 - qmake -v

diff --git a/appveyor.yml b/appveyor.yml
@@ -3,7 +3,7 @@ version: 0.9.0.{build}
 clone_depth: 5
 install:
 - git submodule update --init --recursive
-- set QTDIR=C:\Qt\5.6\msvc2015
+- set QTDIR=C:\Qt\5.7\msvc2015
 - set PATH=%QTDIR%\bin;%PATH%
 - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
 - nuget install -Version 1.6.0.2 -OutputDirectory ./3rdparty/qredisclient/3rdparty/windows rmt_libssh2

diff --git a/src/configure b/src/configure
@@ -12,7 +12,7 @@ DIR=$(dirname "$(readlink -f "$0")") && RDM_DIR=$DIR/../
 
 GetOSVersion
 
-RDM_QT_VERSION=${RDM_QT_VERSION:-561}
+RDM_QT_VERSION=${RDM_QT_VERSION:-57}
 
 if [ "$1" == "breakpad" ]; then
     print_title "Build only Breakpad"