diff options
| -rw-r--r-- | .travis.yml | 25 | ||||
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | logic/Exception.h | 2 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/tst_FileSystem.cpp | 1 | ||||
| -rw-r--r-- | tests/tst_ModList.cpp | 1 | ||||
| -rw-r--r-- | travis/prepare.sh | 10 |
7 files changed, 40 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index b639b03f..c4a064c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,13 +13,34 @@ os: - linux # - osx env: - - QT_VERSION=5.5.1 # latest stable -# - QT_VERSION=5.5-beta # latest + - QT_VERSION=5.0.2 + - QT_VERSION=5.1.1 + - QT_VERSION=5.2.1 + - QT_VERSION=5.3.2 + - QT_VERSION=5.4.2 + - QT_VERSION=5.5.1 # latest matrix: exclude: # only use clang on OS X - os: osx compiler: gcc + # only use the qt available from homebrew + - os: osx + env: QT_VERSION=5.0.2 + - os: osx + env: QT_VERSION=5.1.1 + - os: osx + env: QT_VERSION=5.2.1 + - os: osx + env: QT_VERSION=5.3.2 + - os: osx + env: QT_VERSION=5.4.2 + - os: osx + env: QT_VERSION=5.5.1 + allow_failures: + - env: QT_VERSION=5.0.2 + - env: QT_VERSION=5.1.1 + - env: QT_VERSION=5.2.1 # Install dependencies install: diff --git a/CMakeLists.txt b/CMakeLists.txt index f432f851..73f3d1d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,12 @@ include(Coverity) ################################ 3rd Party Libs ################################ # Find the required Qt parts -find_package(Qt5 COMPONENTS Core Widgets Concurrent Network Test Xml) +find_package(Qt5Core) +find_package(Qt5Widgets) +find_package(Qt5Concurrent) +find_package(Qt5Network) +find_package(Qt5Test) +find_package(Qt5Xml) # The Qt5 cmake files don't provide its install paths, so ask qmake. include(QMakeQuery) diff --git a/logic/Exception.h b/logic/Exception.h index 0dae39a0..30c7aa45 100644 --- a/logic/Exception.h +++ b/logic/Exception.h @@ -3,7 +3,7 @@ #pragma once #include <QString> -#include <QLoggingCategory> +#include <QDebug> #include <exception> #include "multimc_logic_export.h" diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 89bf63ee..4e37fa34 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,5 +1,5 @@ # run the unit tests with `make test` -find_package(Qt5 COMPONENTS Test Core Network) +find_package(Qt5Test) unset(MultiMC_TESTS) macro(add_unit_test name) diff --git a/tests/tst_FileSystem.cpp b/tests/tst_FileSystem.cpp index a9406d13..ae1f93bb 100644 --- a/tests/tst_FileSystem.cpp +++ b/tests/tst_FileSystem.cpp @@ -1,4 +1,5 @@ #include <QTest> +#include <QTemporaryDir> #include "TestUtil.h" #include "FileSystem.h" diff --git a/tests/tst_ModList.cpp b/tests/tst_ModList.cpp index 09870245..e3aa1435 100644 --- a/tests/tst_ModList.cpp +++ b/tests/tst_ModList.cpp @@ -1,5 +1,6 @@ #include <QTest> +#include <QTemporaryDir> #include "TestUtil.h" #include "FileSystem.h" diff --git a/travis/prepare.sh b/travis/prepare.sh index 39804172..dc63f0bd 100644 --- a/travis/prepare.sh +++ b/travis/prepare.sh @@ -4,21 +4,24 @@ if [ "$TRAVIS_OS_NAME" = "linux" ] then QT_WITHOUT_DOTS=qt$(echo $QT_VERSION | grep -oP "[^\.]*" | tr -d '\n' | tr '[:upper:]' '[:lower]') QT_PKG_PREFIX=$(echo $QT_WITHOUT_DOTS | cut -c1-4) + QT_PKG_INSTALL=$QT_PKG_PREFIX + if [ "$QT_PKG_PREFIX" = "qt50" ]; then QT_PKG_PREFIX=qt QT_PKG_INSTALL=qt5; fi echo $QT_WITHOUT_DOTS echo $QT_PKG_PREFIX + echo $QT_PKG_INSTALL sudo add-apt-repository -y ppa:beineri/opt-${QT_WITHOUT_DOTS} sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test # for a recent GCC sudo add-apt-repository "deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.5 main" sudo apt-get update -qq - sudo apt-get install ${QT_PKG_PREFIX}base ${QT_PKG_PREFIX}svg ${QT_PKG_PREFIX}tools ${QT_PKG_PREFIX}x11extras ${QT_PKG_PREFIX}webkit + sudo apt-get install ${QT_PKG_PREFIX}base ${QT_PKG_PREFIX}svg ${QT_PKG_PREFIX}tools ${QT_PKG_PREFIX}webkit sudo mkdir -p /opt/cmake-3/ wget --no-check-certificate http://www.cmake.org/files/v3.2/cmake-3.2.2-Linux-x86_64.sh sudo sh cmake-3.2.2-Linux-x86_64.sh --skip-license --prefix=/opt/cmake-3/ - export CMAKE_PREFIX_PATH=/opt/$QT_PKG_PREFIX/lib/cmake - export PATH=/opt/cmake-3/bin:/opt/$QT_PKG_PREFIX/bin:$PATH + export CMAKE_PREFIX_PATH=/opt/$QT_PKG_INSTALL/lib/cmake + export PATH=/opt/cmake-3/bin:/opt/$QT_PKG_INSTALL/bin:$PATH if [ "$CXX" = "g++" ]; then sudo apt-get install -y -qq g++-5 @@ -40,3 +43,4 @@ fi cmake -version qmake -version $CXX -v +echo "CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH" |