Skip to content

Commit b4034f8

Browse files
committed
cmake: fix build with Qt 6.10
1 parent 136d66c commit b4034f8

3 files changed

Lines changed: 8 additions & 1 deletion

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
qt_modules: qtscxml qtremoteobjects
3434
qt_arch: win64_msvc2019_64
3535
macos_architectures: "x86_64;arm64"
36-
- qt_version: 6.9.0 # Bump to latest freely
36+
- qt_version: 6.10.0 # Bump to latest freely
3737
qt_modules: qtscxml qtremoteobjects
3838
qt_arch: win64_msvc2022_64
3939
macos_architectures: "x86_64;arm64"

CHANGES

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ Version 2.2.0:
22
--------------
33
* Bump to Graphviz 13.1.0
44
* Remove Qt 5 support to simplify maintenance
5+
* Fix build with Qt 6.10
56

67
Version 2.1.0:
78
--------------

CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,12 @@ set_package_properties(
142142
PURPOSE "Needed for the Qt SCXML adapter (adapter itself depends on Qt RemoteObjects)"
143143
)
144144

145+
if(Qt6Gui_VERSION VERSION_GREATER_EQUAL "6.10.0")
146+
set(QT_NO_PRIVATE_MODULE_WARNING ON)
147+
find_package(Qt6GuiPrivate REQUIRED NO_MODULE)
148+
find_package(Qt6ScxmlPrivate REQUIRED NO_MODULE)
149+
endif()
150+
145151
include(CheckCCompilerFlag)
146152
include(CheckCXXCompilerFlag)
147153
include(CheckIncludeFiles)

0 commit comments

Comments
 (0)