diff --git a/travis-compile.sh b/travis-compile.sh index 148169c6..96e095ed 100755 --- a/travis-compile.sh +++ b/travis-compile.sh @@ -8,5 +8,8 @@ prefix="" if [[ $TRAVIS_OS_NAME == "osx" && $QT4 == 0 ]]; then prefix="-DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.4.0/" fi +if [[ $TRAVIS_OS_NAME == "linux" && $QT4 == 0 ]]; then + prefix="-DCMAKE_PREFIX_PATH=/opt/qt52/lib/cmake/" +fi cmake .. -DWITH_SERVER=1 -DWITH_QT4=$QT4 $prefix make -j2 diff --git a/travis-dependencies.sh b/travis-dependencies.sh index 5878b513..df75a487 100755 --- a/travis-dependencies.sh +++ b/travis-dependencies.sh @@ -12,10 +12,9 @@ else sudo apt-get update -qq sudo apt-get install -y qtmobility-dev libprotobuf-dev protobuf-compiler libqt4-dev else - sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa + sudo add-apt-repository --yes ppa:beineri/opt-qt521 sudo apt-get update -qq - sudo apt-get install -y libprotobuf-dev protobuf-compiler qtbase5-dev cmake\ - qtdeclarative5-dev libqt5webkit5-dev libsqlite3-dev qt5-default qttools5-dev-tools\ - qttools5-dev qtmultimedia5-dev libqt5svg5-dev + sudo apt-get install -y libprotobuf-dev protobuf-compiler cmake libsqlite3-dev\ + qt52base qt52webkit qt52tools qt52svg fi fi