Skip to content

Commit 75987af

Browse files
authored
Switch to Qt 5.7 (RedisInsight#3718)
* Switch to Qt 5.7 * Update configure * Update .travis.yml
1 parent 52c45c1 commit 75987af

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ install:
1515
fi
1616
- cd ./src && ./configure && cd ./../
1717
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then
18-
source /opt/qt56/bin/qt56-env.sh
18+
source /opt/qt57/bin/qt57-env.sh
1919
;
2020
fi
2121
- qmake -v

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 0.9.0.{build}
33
clone_depth: 5
44
install:
55
- git submodule update --init --recursive
6-
- set QTDIR=C:\Qt\5.6\msvc2015
6+
- set QTDIR=C:\Qt\5.7\msvc2015
77
- set PATH=%QTDIR%\bin;%PATH%
88
- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
99
- nuget install -Version 1.6.0.2 -OutputDirectory ./3rdparty/qredisclient/3rdparty/windows rmt_libssh2

src/configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ DIR=$(dirname "$(readlink -f "$0")") && RDM_DIR=$DIR/../
1212

1313
GetOSVersion
1414

15-
RDM_QT_VERSION=${RDM_QT_VERSION:-561}
15+
RDM_QT_VERSION=${RDM_QT_VERSION:-57}
1616

1717
if [ "$1" == "breakpad" ]; then
1818
print_title "Build only Breakpad"

0 commit comments

Comments
 (0)