Skip to content

Commit f3b0709

Browse files
committed
Build for Qt6 by default
If your Qt5 build broke, pass -DKDSoap_QT6=OFF to CMake.
1 parent 57485db commit f3b0709

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#
1313
# -DKDSoap_QT6=[true|false]
1414
# Build against Qt6 rather than Qt5
15-
# Default=false (Qt5 will be used even if Qt6 is available)
15+
# Default=true
1616
#
1717
# -DKDSoap_STATIC=[true|false]
1818
# Build static libraries
@@ -73,7 +73,7 @@ option(${PROJECT_NAME}_STATIC "Build statically" OFF)
7373
option(${PROJECT_NAME}_TESTS "Build the tests" OFF)
7474
option(${PROJECT_NAME}_EXAMPLES "Build the examples" ON)
7575
option(${PROJECT_NAME}_DOCS "Build the API documentation" OFF)
76-
option(${PROJECT_NAME}_QT6 "Build against Qt 6" OFF)
76+
option(${PROJECT_NAME}_QT6 "Build against Qt 6" ON)
7777

7878
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/ECM/modules")
7979
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/KDAB/modules")

distro/qt5-debian.rules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/usr/bin/make -f
2-
DEB_CMAKE_EXTRA_FLAGS = -DCMAKE_BUILD_TYPE=Release
2+
DEB_CMAKE_EXTRA_FLAGS = -DCMAKE_BUILD_TYPE=Release -DKDSoap_QT6=False
33
include /usr/share/cdbs/1/rules/debhelper.mk
44
include /usr/share/cdbs/1/class/cmake.mk

distro/qt5-kdsoap.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ develop programs which need to access web services using the SOAP protocol.
5050

5151
%build
5252
touch .license.accepted
53-
cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_RPATH=True -DCMAKE_BUILD_TYPE=Release
53+
cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_RPATH=True -DCMAKE_BUILD_TYPE=Release -DKDSoap_QT6=False
5454
%__make %{?_smp_mflags}
5555

5656
%post -p /sbin/ldconfig

0 commit comments

Comments
 (0)