Semi-support Qt6 for wxQt port. (PR #24345)
dsa-t
Gets wxQt with Qt6 building with CMake, and samples (widgets, cube, pyramid) running.
Sort of implements #24208.
glib-2.0 is needed to work around removal of QAbstractEventDispatcher::hasPendingEvents() in Qt6.
You can view, comment on, or merge this pull request online at:
https://github.com/wxWidgets/wxWidgets/pull/24345
Commit Summary
- a032733 Semi-support Qt6.
File Changes
(23 files)
- M build/cmake/toolkit.cmake (30)
- M include/wx/qt/glcanvas.h (10)
- M include/wx/qt/private/winevent.h (14)
- M include/wx/qt/region.h (8)
- M include/wx/qt/window.h (4)
- M src/qt/accel.cpp (3)
- M src/qt/cursor.cpp (5)
- M src/qt/dcscreen.cpp (13)
- M src/qt/display.cpp (21)
- M src/qt/evtloop.cpp (23)
- M src/qt/font.cpp (4)
- M src/qt/glcanvas.cpp (78)
- M src/qt/listctrl.cpp (18)
- M src/qt/menu.cpp (1)
- M src/qt/menuitem.cpp (7)
- M src/qt/radiobox.cpp (10)
- M src/qt/renderer.cpp (2)
- M src/qt/settings.cpp (6)
- M src/qt/statbmp.cpp (6)
- M src/qt/toolbar.cpp (6)
- M src/qt/treectrl.cpp (2)
- M src/qt/utils.cpp (1)
- M src/qt/window.cpp (38)
Patch Links:
- https://github.com/wxWidgets/wxWidgets/pull/24345.patch
- https://github.com/wxWidgets/wxWidgets/pull/24345.diff
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Maarten
@MaartenBent commented on this pull request.
Nice addition.
AppVeyor is still set to Qt 5.11 so requiring 5.15 causes problems there.
> @@ -126,14 +126,32 @@ if(UNIX AND NOT APPLE AND NOT WIN32 AND (WXX11 OR WXGTK2 OR (WXGTK AND wxHAVE_GD
endif()
if(WXQT)
- set(QT_COMPONENTS Core Widgets Gui OpenGL Test)
+ set(QT_COMPONENTS Core Widgets Gui OpenGL OpenGLWidgets Test)
+
+ find_package(Qt6 COMPONENTS ${QT_COMPONENTS})
+ if (Qt6_FOUND)
+ set(QT_MAJOR_VERSION 6)
+
+ find_package(PkgConfig REQUIRED)
+
+ pkg_check_modules (GLIB2 REQUIRED glib-2.0)
+ include_directories(${GLIB2_INCLUDE_DIRS})
This should be removed. We definitely do not wan't to add them to each target. Is adding them to wxTOOLKIT_INCLUDE_DIRS below not enough?
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
dsa-t
@dsa-t pushed 3 commits.
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
dsa-t
@dsa-t pushed 1 commit.
- f3c2551 Compatibility with older Qt5.
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
dsa-t
@dsa-t commented on this pull request.
> @@ -126,14 +126,32 @@ if(UNIX AND NOT APPLE AND NOT WIN32 AND (WXX11 OR WXGTK2 OR (WXGTK AND wxHAVE_GD
endif()
if(WXQT)
- set(QT_COMPONENTS Core Widgets Gui OpenGL Test)
+ set(QT_COMPONENTS Core Widgets Gui OpenGL OpenGLWidgets Test)
+
+ find_package(Qt6 COMPONENTS ${QT_COMPONENTS})
+ if (Qt6_FOUND)
+ set(QT_MAJOR_VERSION 6)
+
+ find_package(PkgConfig REQUIRED)
+
+ pkg_check_modules (GLIB2 REQUIRED glib-2.0)
+ include_directories(${GLIB2_INCLUDE_DIRS})
Seems enough, now fixed.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
dsa-t
@dsa-t pushed 1 commit.
- 6ce737d Qt fixes.
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
vadz left a comment (wxWidgets/wxWidgets#24345)@AliKet Is there anything still worth keeping here or should this one be closed?
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
AliKet
AliKet left a comment (wxWidgets/wxWidgets#24345)Can safely be closed as everything here is in master now, thanks.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
Closed #24345.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.