Stop supporting Qt older than 5.12

This both removes older Qt from the CI and also adjust all the
find_package calls in CMakeLists.txt

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>

diff --git a/.drone.yml b/.drone.yml
index 09082ee5498931cb1f4bc335f993d20d2029667a..e546122f06aaa174da9d690737ce80e52bacd038 100644 (file)
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,164 +1,4 @@
 kind: pipeline
-name: qt-5.9
-
-steps:
-- name: build and test
-  image: nextcloudci/client-5.9:client-5.9-5
-  commands:
-    # Install QtKeyChain
-    - /bin/bash -c "
-      source /opt/qt59/bin/qt59-env.sh &&
-      cd /tmp &&
-      git clone https://github.com/frankosterfeld/qtkeychain.git &&
-      cd qtkeychain &&
-      git checkout v0.9.1 &&
-      mkdir build &&
-      cd build &&
-      cmake ../ &&
-      make &&
-      make install"
-    # Build client
-    - /bin/bash -c "
-      source /opt/qt59/bin/qt59-env.sh &&
-      mkdir build &&
-      cd build &&
-      cmake -D NO_SHIBBOLETH=1 -DBUILD_UPDATER=ON -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 -DSANITIZE_ADDRESS=ON  ../ &&
-      make &&
-      useradd -m -s /bin/bash test &&
-      chown -R test:test . &&
-      su -c 'ASAN_OPTIONS=detect_leaks=0 ctest --output-on-failure' test"
-trigger:
-  branch:
-    - master
-  event:
-    - pull_request
-    - push
-
----
-kind: pipeline
-name: qt-5.10
-
-steps:
-- name: build and test
-  image: nextcloudci/client-5.10:client-5.10-3
-  commands:
-    # Install QtKeyChain
-    - /bin/bash -c "
-      export CC=gcc-7 &&
-      export CXX=g++-7 &&
-      source /opt/qt510/bin/qt510-env.sh &&
-      cd /tmp &&
-      git clone https://github.com/frankosterfeld/qtkeychain.git &&
-      cd qtkeychain &&
-      git checkout v0.9.1 &&
-      mkdir build &&
-      cd build &&
-      cmake ../ &&
-      make &&
-      make install"
-    # Build client
-    - /bin/bash -c "
-      export CC=gcc-7 &&
-      export CXX=g++-7 &&
-      source /opt/qt510/bin/qt510-env.sh &&
-      mkdir build &&
-      cd build &&
-      cmake -D NO_SHIBBOLETH=1 -DBUILD_UPDATER=ON -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 -DSANITIZE_ADDRESS=ON ../ &&
-      make &&
-      useradd -m -s /bin/bash test &&
-      chown -R test:test . &&
-      su -c 'ASAN_OPTIONS=detect_leaks=0 ctest --output-on-failure' test"
-trigger:
-  branch:
-    - master
-  event:
-    - pull_request
-    - push
-
----
-kind: pipeline
-name: qt-5.11
-
-steps:
-- name: build and test
-  image: nextcloudci/client-5.11:client-5.11-3
-  commands:
-    # Install QtKeyChain
-    - /bin/bash -c "
-      export CC=gcc-7 &&
-      export CXX=g++-7 &&
-      source /opt/qt511/bin/qt511-env.sh &&
-      cd /tmp &&
-      git clone https://github.com/frankosterfeld/qtkeychain.git &&
-      cd qtkeychain &&
-      git checkout v0.9.1 &&
-      mkdir build &&
-      cd build &&
-      cmake ../ &&
-      make &&
-      make install"
-    # Build client
-    - /bin/bash -c "
-      export CC=gcc-7 &&
-      export CXX=g++-7 &&
-      source /opt/qt511/bin/qt511-env.sh &&
-      mkdir build &&
-      cd build &&
-      cmake -D NO_SHIBBOLETH=1 -DBUILD_UPDATER=ON -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 -DSANITIZE_ADDRESS=ON ../ &&
-      make &&
-      useradd -m -s /bin/bash test &&
-      chown -R test:test . &&
-      su -c 'ASAN_OPTIONS=detect_leaks=0 ctest --output-on-failure' test"
-trigger:
-  branch:
-    - master
-  event:
-    - pull_request
-    - push
-
----
-kind: pipeline
-name: qt-5.11-clang
-
-steps:
-- name: build and test
-  image: nextcloudci/client-5.11:client-5.11-3
-  commands:
-    # Install QtKeyChain
-    - /bin/bash -c "
-      export CC=clang-6.0 &&
-      export CXX=clang++-6.0 &&
-      source /opt/qt511/bin/qt511-env.sh &&
-      cd /tmp &&
-      git clone https://github.com/frankosterfeld/qtkeychain.git &&
-      cd qtkeychain &&
-      git checkout v0.9.1 &&
-      mkdir build &&
-      cd build &&
-      cmake ../ &&
-      make &&
-      make install"
-    # Build client
-    - /bin/bash -c "
-      export CC=clang-6.0 &&
-      export CXX=clang++-6.0 &&
-      source /opt/qt511/bin/qt511-env.sh &&
-      mkdir build &&
-      cd build &&
-      cmake -D NO_SHIBBOLETH=1 -DBUILD_UPDATER=ON -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 -DSANITIZE_ADDRESS=ON ../ &&
-      make &&
-      useradd -m -s /bin/bash test &&
-      chown -R test:test . &&
-      su -c 'ASAN_OPTIONS=detect_leaks=0 ctest --output-on-failure' test"
-trigger:
-  branch:
-    - master
-  event:
-    - pull_request
-    - push
-
----
-kind: pipeline
 name: qt-5.12
 
 steps:

diff --git a/admin/osx/CMakeLists.txt b/admin/osx/CMakeLists.txt
index 83b572a9e2fe1ff135ba83ebaae764a6c6219fb4..55130798b13a67932bca3e66c521366ef5826ad7 100644 (file)
--- a/admin/osx/CMakeLists.txt
+++ b/admin/osx/CMakeLists.txt
@@ -11,7 +11,7 @@ else()
   set(MAC_INSTALLER_DO_CUSTOM_BACKGROUND "0")
 endif()
 
-find_package(Qt5 5.6 COMPONENTS Core REQUIRED)
+find_package(Qt5 5.12 COMPONENTS Core REQUIRED)
 configure_file(create_mac.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh)
 configure_file(macosx.pkgproj.cmake ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj)
 configure_file(pre_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh)

diff --git a/shell_integration/dolphin/CMakeLists.txt b/shell_integration/dolphin/CMakeLists.txt
index 41cde7afb232b678f960cfe7170a2ed1735297ea..aca4a2d5173666edf7eb3b7669b40ebadfa5b392 100644 (file)
--- a/shell_integration/dolphin/CMakeLists.txt
+++ b/shell_integration/dolphin/CMakeLists.txt
@@ -2,7 +2,7 @@ project(dolphin-owncloud)
 
 cmake_minimum_required(VERSION 2.8.12)
 include(FeatureSummary)
-set(QT_MIN_VERSION "5.3.0")
+set(QT_MIN_VERSION "5.12.0")
 set(KF5_MIN_VERSION "5.16.0")
 set(KDE_INSTALL_USE_QT_SYS_PATHS ON CACHE BOOL "Install the plugin in the right directory")
 

diff --git a/shell_integration/libcloudproviders/CMakeLists.txt b/shell_integration/libcloudproviders/CMakeLists.txt
index 1f353352c7968c00482dde2549f1b24eb1d634f5..45c8b0f32897ec8b7d1f6bd91e8a6f0045b2a554 100644 (file)
--- a/shell_integration/libcloudproviders/CMakeLists.txt
+++ b/shell_integration/libcloudproviders/CMakeLists.txt
@@ -41,7 +41,7 @@ macro(libcloudproviders_add_config _sources)
 endmacro(libcloudproviders_add_config _sources)
 
 
-find_package(Qt5 5.6 COMPONENTS DBus)
+find_package(Qt5 5.12 COMPONENTS DBus)
 IF (UNIX AND Qt5DBus_FOUND AND LIBCLOUDPROVIDERS_FOUND)
     STRING(TOLOWER "${APPLICATION_VENDOR}" DBUS_VENDOR)
     STRING(REGEX REPLACE "[^A-z0-9]" "" DBUS_VENDOR "${DBUS_VENDOR}")

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ce4d4fbd1bcecdb408cea1ba73618e5a22518404..cb83e784ab07895b32de33f8109e4ffad3c46534 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,10 +4,7 @@ endif()
 
 set(synclib_NAME ${APPLICATION_EXECUTABLE}sync)
 
-find_package(Qt5 5.6 COMPONENTS Core Network Xml Concurrent WebEngineWidgets WebEngine REQUIRED)
-if (Qt5Core_VERSION VERSION_LESS 5.9.0)
-message(STATUS "For HTTP/2 support, compile with Qt 5.9 or higher.")
-endif()
+find_package(Qt5 5.12 COMPONENTS Core Network Xml Concurrent WebEngineWidgets WebEngine REQUIRED)
 
 if(NOT TOKEN_AUTH_ONLY)
     find_package(Qt5Keychain REQUIRED)