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 -DKDReports_QT6=OFF to CMake.
  • Loading branch information
dfaure-kdab authored and iamsergio committed Feb 25, 2025
1 parent 5a5e889 commit 1548f56
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 @@ -10,7 +10,7 @@
#
# -DKDReports_QT6=[true|false]
# Build against Qt6 rather than Qt5
# Default=false (Qt5 will be used even if Qt6 is available)
# Default=true
#
# -DKDReports_STATIC=[true|false]
# Build static libraries
Expand Down Expand Up @@ -80,7 +80,7 @@ set(${PROJECT_NAME}_SOVERSION ${${PROJECT_NAME}_VERSION_MAJOR})

include(FeatureSummary)

option(${PROJECT_NAME}_QT6 "Build against Qt 6" OFF)
option(${PROJECT_NAME}_QT6 "Build against Qt 6" ON)
option(${PROJECT_NAME}_STATIC "Build statically" OFF)
option(${PROJECT_NAME}_TESTS "Build the tests" ON)
option(${PROJECT_NAME}_EXAMPLES "Build the examples" ON)
Expand Down
1 change: 1 addition & 0 deletions distro/qt5-debian.rules
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/usr/bin/make -f
DEB_CMAKE_EXTRA_FLAGS = -DKDReports_QT6=False -DCMAKE_BUILD_TYPE=Release
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
2 changes: 1 addition & 1 deletion distro/qt5-kdreports.spec
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ develop programs using kdreports.
%setup -q

%build
cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DKDReports_QT6=False
%__make %{?_smp_mflags}

%post -p /sbin/ldconfig
Expand Down
2 changes: 1 addition & 1 deletion docs/CHANGES_2_4.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ What is new in KD Reports 2.4

General:
--------
*
* KDReports now looks for Qt6 by default, rather than Qt5. If your Qt5 build broke, pass -DKDReports_QT6=OFF to CMake.

Bugfixes:
-------------
Expand Down

0 comments on commit 1548f56

Please sign in to comment.