Skip to content

Commit

Permalink
KDSingleApplication now looks for Qt6 by default, rather than Qt5.
Browse files Browse the repository at this point in the history
If your Qt5 build broke, pass -DKDSingleApplication_QT6=OFF to CMake.
  • Loading branch information
dfaure-kdab committed Feb 25, 2025
1 parent 01239a1 commit 4bbc076
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#
# -DKDSingleApplication_QT6=[true|false]
# Build against Qt6 rather than Qt5
# Default=false (Qt5 will be used even if Qt6 is available)
# Default=true
#
# -DKDSingleApplication_STATIC=[true|false]
# Build static versions of the libraries
Expand Down Expand Up @@ -63,7 +63,7 @@ cmake_policy(SET CMP0042 NEW)

include(FeatureSummary)

option(${PROJECT_NAME}_QT6 "Build against Qt 6" OFF)
option(${PROJECT_NAME}_QT6 "Build against Qt 6" ON)
option(${PROJECT_NAME}_DEVELOPER_MODE "Developer Mode" OFF)
option(${PROJECT_NAME}_TESTS "Build the tests" OFF)
option(${PROJECT_NAME}_EXAMPLES "Build the examples" ON)
Expand Down
3 changes: 2 additions & 1 deletion Changelog
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
* v1.2.0 (unreleased)
-
- KDSingleApplication now looks for Qt6 by default, rather than Qt5. If your Qt5
build broke, pass -DKDSingleApplication_QT6=OFF to CMake.

* v1.1.1 (unreleased)
-
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 -DKDSingleApplication_STATIC=True
DEB_CMAKE_EXTRA_FLAGS = -DCMAKE_BUILD_TYPE=Release -DKDSingleApplication_QT6=False -DKDSingleApplication_STATIC=True
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
2 changes: 1 addition & 1 deletion distro/qt5-kdsingleapplication.spec
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ develop programs using kdsingleapplication.
%autosetup

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

%post -p /sbin/ldconfig
Expand Down

0 comments on commit 4bbc076

Please sign in to comment.