diff --git a/.travis.yml b/.travis.yml index 6e26860f1..17b25fd5c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,9 +7,9 @@ compiler: language: cpp install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update; fi - - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install cmake libqt4-dev libgcrypt11-dev zlib1g-dev libxtst-dev; fi + - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install cmake qtbase5-dev libqt5x11extras5-dev qttools5-dev libgcrypt11-dev zlib1g-dev libxtst-dev; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; fi - - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install cmake qt libgcrypt; fi + - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install cmake qt5 libgcrypt; fi before_script: mkdir build && pushd build script: - cmake -DCMAKE_BUILD_TYPE=Debug -DWITH_GUI_TESTS=ON .. diff --git a/CMakeLists.txt b/CMakeLists.txt index 6759bc912..c24aab333 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -161,11 +161,11 @@ if(WITH_TESTS) enable_testing() endif(WITH_TESTS) -find_package(Qt5Core REQUIRED) -find_package(Qt5Concurrent REQUIRED) -find_package(Qt5Widgets REQUIRED) -find_package(Qt5Test REQUIRED) -find_package(Qt5LinguistTools REQUIRED) +find_package(Qt5Core 5.2 REQUIRED) +find_package(Qt5Concurrent 5.2 REQUIRED) +find_package(Qt5Widgets 5.2 REQUIRED) +find_package(Qt5Test 5.2 REQUIRED) +find_package(Qt5LinguistTools 5.2 REQUIRED) set(CMAKE_AUTOMOC ON) # Debian sets the the build type to None for package builds. diff --git a/README.md b/README.md index 326bd4a6c..7d009a0af 100644 --- a/README.md +++ b/README.md @@ -49,20 +49,20 @@ Once downloaded, double click on the file to execute the installer. The following tools must exist within your PATH: * make -* cmake (>= 2.6.4) +* cmake (>= 2.8.12) * g++ or clang++ The following libraries are required: -* Qt 4 (>= 4.6) +* Qt 5 (>= 5.2): qtbase and qttools5 * libgcrypt * zlib -* libxtst (optional for auto-type on X11) +* libxtst, qtx11extras (optional for auto-type on X11) On Debian you can install them with: ```bash -sudo apt-get install build-essential cmake libqt4-dev libgcrypt11-dev zlib1g-dev +sudo apt-get install build-essential cmake qtbase5-dev libqt5x11extras5-dev qttools5-dev libgcrypt11-dev zlib1g-dev ``` #### Build Steps diff --git a/src/autotype/CMakeLists.txt b/src/autotype/CMakeLists.txt index d332a2392..044bf90ba 100644 --- a/src/autotype/CMakeLists.txt +++ b/src/autotype/CMakeLists.txt @@ -1,6 +1,6 @@ if(UNIX AND NOT APPLE) find_package(X11) - find_package(Qt5X11Extras) + find_package(Qt5X11Extras 5.2) add_feature_info(libXi X11_Xi_FOUND "The X11 Xi Protocol library is required for auto-type") add_feature_info(libXtest X11_XTest_FOUND "The X11 XTEST Protocol library is required for auto-type") add_feature_info(Qt5X11Extras Qt5X11Extras_FOUND "The Qt5X11Extras library is required for auto-type")