Build for Qt6 by default

If your Qt5 build broke, pass -DKDSoap_QT6=OFF to CMake.

Author: dfaure-kdab

CMakeLists.txt

@@ -12,7 +12,7 @@
 #
 # -DKDSoap_QT6=[true|false]
 #  Build against Qt6 rather than Qt5
-#  Default=false (Qt5 will be used even if Qt6 is available)
+#  Default=true
 #
 # -DKDSoap_STATIC=[true|false]
 #  Build static libraries
@@ -73,7 +73,7 @@ option(${PROJECT_NAME}_STATIC "Build statically" OFF)
 option(${PROJECT_NAME}_TESTS "Build the tests" OFF)
 option(${PROJECT_NAME}_EXAMPLES "Build the examples" ON)
 option(${PROJECT_NAME}_DOCS "Build the API documentation" OFF)
-option(${PROJECT_NAME}_QT6 "Build against Qt 6" OFF)
+option(${PROJECT_NAME}_QT6 "Build against Qt 6" ON)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/ECM/modules")
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/KDAB/modules")

distro/qt5-debian.rules

@@ -1,4 +1,4 @@
 #!/usr/bin/make -f
-DEB_CMAKE_EXTRA_FLAGS = -DCMAKE_BUILD_TYPE=Release
+DEB_CMAKE_EXTRA_FLAGS = -DCMAKE_BUILD_TYPE=Release -DKDSoap_QT6=False
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk

distro/qt5-kdsoap.spec

@@ -50,7 +50,7 @@ develop programs which need to access web services using the SOAP protocol.
 
 %build
 touch .license.accepted
-cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_RPATH=True -DCMAKE_BUILD_TYPE=Release
+cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_RPATH=True -DCMAKE_BUILD_TYPE=Release -DKDSoap_QT6=False
 %__make %{?_smp_mflags}
 
 %post -p /sbin/ldconfig

docs/CHANGES_2_3.txt

@@ -2,6 +2,7 @@
 General:
 ========
 * C++17 is now required. Qt-5.15 is still supported, in addition to the latest Qt6 versions.
+* KDSoap now looks for Qt6 by default, rather than Qt5. If your Qt5 build broke, pass -DKDSoap_QT6=OFF to CMake.
 
 Client-side:
 ============