Skip to content

Commit

Permalink
Build for Qt6 by default
Browse files Browse the repository at this point in the history
If your Qt5 build broke, pass -DKDSoap_QT6=OFF to CMake.
  • Loading branch information
dfaure-kdab committed Feb 25, 2025
1 parent 308956b commit ecb5191
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion distro/qt5-debian.rules
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion distro/qt5-kdsoap.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions docs/CHANGES_2_3.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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:
============
Expand Down

0 comments on commit ecb5191

Please sign in to comment.