diff --git a/.travis.yml b/.travis.yml index a1c468ff..8aa35794 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,8 +19,4 @@ notifications: on_failure: change on_start: false matrix: - fast_finish: true - allow_failures: - - compiler: clang - os: linux - env: QT4=0 + fast_finish: true \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 838bf4e1..92f85ef2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -107,7 +107,8 @@ OPTION(UPDATE_TRANSLATIONS "Update translations on compile" OFF) MESSAGE("UPDATE TRANSLATIONS: ${UPDATE_TRANSLATIONS}") IF(NOT WITH_QT4) - FIND_PACKAGE(Qt5Widgets) + # First known not-broken Qt5 version (5.0.2 available on old ubuntus is buggy). + FIND_PACKAGE(Qt5Widgets 5.0.3) ENDIF() IF(Qt5Widgets_FOUND) 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..63fdc24c 100755 --- a/travis-dependencies.sh +++ b/travis-dependencies.sh @@ -12,10 +12,10 @@ 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 -y ppa:beineri/opt-qt521 + sudo add-apt-repository -y ppa:kalakris/cmake 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 qt52multimedia fi fi