-
Notifications
You must be signed in to change notification settings - Fork 1.7k
[WPE][Qt] Add support for building QtWPE against Qt 6 #25197
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
|
EWS run on previous version of this PR (hash d889dac) |
|
Marked as draft because we need to investigate the following crash with Qt6: |
|
EWS run on previous version of this PR (hash b9d28c7) |
|
EWS run on previous version of this PR (hash 3149ae0) |
3149ae0 to
eb8b32c
Compare
|
EWS run on previous version of this PR (hash eb8b32c) |
|
EWS run on previous version of this PR (hash db22400) |
db22400 to
adb1ec2
Compare
|
EWS run on previous version of this PR (hash adb1ec2) |
adb1ec2 to
8501b35
Compare
|
EWS run on previous version of this PR (hash 8501b35) |
8501b35 to
288fc0b
Compare
|
EWS run on previous version of this PR (hash 288fc0b) |
288fc0b to
11d79ad
Compare
|
EWS run on previous version of this PR (hash 11d79ad) |
11d79ad to
5f1b72a
Compare
|
EWS run on previous version of this PR (hash 5f1b72a) |
3b4cb2b to
d6b44ce
Compare
|
EWS run on previous version of this PR (hash d6b44ce) |
d6b44ce to
afac365
Compare
|
EWS run on previous version of this PR (hash afac365) |
afac365 to
45281d7
Compare
|
EWS run on previous version of this PR (hash 45281d7) |
45281d7 to
53ef927
Compare
|
EWS run on previous version of this PR (hash 53ef927) |
53ef927 to
7eda88b
Compare
|
EWS run on previous version of this PR (hash 7eda88b) |
|
I adressed all comments, ready to go :-) |
|
No reviewer information in commit message, blocking PR #25197 |
7eda88b to
c701f51
Compare
|
EWS run on current version of this PR (hash c701f51) |
c701f51 to
a3aa668
Compare
https://bugs.webkit.org/show_bug.cgi?id=270161 Reviewed by Carlos Garcia Campos. - Keep the existing Qt 5 based WPEQt implementation and rename: - Source/WebKit/UIProcess/API/wpe/qt -> Source/WebKit/UIProcess/API/wpe/qt5 - Tools/MiniBrowser/wpe/qt -> Tools/MiniBrowser/wpe/qt5 - Add a new WPEQt implementation for Qt 6, based on the new WPE platform API, that was recently developed, not relying on WPEBackend(-fdo) anymore. Touch / wheel / hover / mouse / keyboard events are supported, only keyboard+mouse events were tested so far. - Polish UI: Add navigation buttons (back|forward|reload) / URL bar for Qt 6 MiniBrowser - Make the WebKitWebView ref-counted in WPEQtView, by wrapping in GRefPtr (needs some moc related plumbing to allow for config.h inclusion, which is a pre-requisite to get wtf/ headers includable). Tested using: build-webkit --wpe --debug --cmakeargs "-DUSE_QT6=ON|OFF" run-qt-wpe-minibrowser --debug https://www.igalia.com Covered by existing tests, no change in default behavior. * Source/WebKit/PlatformWPE.cmake: * Source/WebKit/UIProcess/API/wpe/qt5/CMakeLists.txt: Renamed from Source/WebKit/UIProcess/API/wpe/qt/CMakeLists.txt. * Source/WebKit/UIProcess/API/wpe/qt5/WPEQmlExtensionPlugin.cpp: Copied from Source/WebKit/UIProcess/API/wpe/qt/WPEQmlExtensionPlugin.cpp. * Source/WebKit/UIProcess/API/wpe/qt5/WPEQmlExtensionPlugin.h: Copied from Source/WebKit/UIProcess/API/wpe/qt/WPEQmlExtensionPlugin.h. * Source/WebKit/UIProcess/API/wpe/qt5/WPEQtView.cpp: Copied from Source/WebKit/UIProcess/API/wpe/qt/WPEQtView.cpp. * Source/WebKit/UIProcess/API/wpe/qt5/WPEQtView.h: Copied from Source/WebKit/UIProcess/API/wpe/qt/WPEQtView.h. * Source/WebKit/UIProcess/API/wpe/qt5/WPEQtViewBackend.cpp: Renamed from Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewBackend.cpp. (WPEQtViewBackend::texture): * Source/WebKit/UIProcess/API/wpe/qt5/WPEQtViewBackend.h: Renamed from Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewBackend.h. * Source/WebKit/UIProcess/API/wpe/qt5/WPEQtViewLoadRequest.cpp: Copied from Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewLoadRequest.cpp. * Source/WebKit/UIProcess/API/wpe/qt5/WPEQtViewLoadRequest.h: Copied from Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewLoadRequest.h. * Source/WebKit/UIProcess/API/wpe/qt5/WPEQtViewLoadRequestPrivate.h: Copied from Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewLoadRequestPrivate.h. * Source/WebKit/UIProcess/API/wpe/qt5/qmldir: Copied from Source/WebKit/UIProcess/API/wpe/qt/qmldir. * Source/WebKit/UIProcess/API/wpe/qt6/WPEDisplayQtQuick.cpp: Added. (wpeDisplayQtQuickConnect): (wpeDisplayQtQuickCreateView): (wpeDisplayQtQuickGetEGLDisplay): (wpeDisplayQtQuickGetDRMDevice): (wpeDisplayQtQuickGetDRMRenderNode): (wpe_display_qtquick_class_init): (wpe_display_qtquick_new): * Source/WebKit/UIProcess/API/wpe/qt6/WPEDisplayQtQuick.h: Added. * Source/WebKit/UIProcess/API/wpe/qt6/WPEQmlExtensionPlugin.cpp: Renamed from Source/WebKit/UIProcess/API/wpe/qt/WPEQmlExtensionPlugin.cpp. (WPEQmlExtensionPlugin::registerTypes): * Source/WebKit/UIProcess/API/wpe/qt6/WPEQmlExtensionPlugin.h: Renamed from Source/WebKit/UIProcess/API/wpe/qt/WPEQmlExtensionPlugin.h. * Source/WebKit/UIProcess/API/wpe/qt6/WPEQtView.cpp: Renamed from Source/WebKit/UIProcess/API/wpe/qt/WPEQtView.cpp. (WPEQtView::WPEQtView): (WPEQtView::~WPEQtView): (WPEQtView::geometryChange): (WPEQtView::configureWindow): (WPEQtView::createWebView): (WPEQtView::notifyUrlChangedCallback): (WPEQtView::notifyTitleChangedCallback): (WPEQtView::notifyLoadProgressCallback): (WPEQtView::notifyLoadChangedCallback): (WPEQtView::notifyLoadFailedCallback): (WPEQtView::didUpdateScene): (WPEQtView::updatePaintNode): (WPEQtView::url const): (WPEQtView::setUrl): (WPEQtView::loadProgress const): (WPEQtView::title const): (WPEQtView::canGoBack const): (WPEQtView::isLoading const): (WPEQtView::canGoForward const): (WPEQtView::goBack): (WPEQtView::goForward): (WPEQtView::reload): (WPEQtView::stop): (WPEQtView::loadHtml): (JavascriptCallbackData::JavascriptCallbackData): (jsAsyncReadyCallback): (WPEQtView::runJavaScript): (WPEQtView::mousePressEvent): (WPEQtView::mouseMoveEvent): (WPEQtView::mouseReleaseEvent): (WPEQtView::hoverEnterEvent): (WPEQtView::hoverLeaveEvent): (WPEQtView::hoverMoveEvent): (WPEQtView::wheelEvent): (WPEQtView::keyPressEvent): (WPEQtView::keyReleaseEvent): (WPEQtView::touchEvent): (WPEQtView::webView const): * Source/WebKit/UIProcess/API/wpe/qt6/WPEQtView.h: Renamed from Source/WebKit/UIProcess/API/wpe/qt/WPEQtView.h. * Source/WebKit/UIProcess/API/wpe/qt6/WPEQtViewLoadRequest.cpp: Renamed from Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewLoadRequest.cpp. (WPEQtViewLoadRequest::WPEQtViewLoadRequest): (WPEQtViewLoadRequest::~WPEQtViewLoadRequest): (WPEQtViewLoadRequest::url const): (WPEQtViewLoadRequest::status const): (WPEQtViewLoadRequest::errorString const): * Source/WebKit/UIProcess/API/wpe/qt6/WPEQtViewLoadRequest.h: Renamed from Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewLoadRequest.h. * Source/WebKit/UIProcess/API/wpe/qt6/WPEQtViewLoadRequestPrivate.h: Renamed from Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewLoadRequestPrivate.h. (WPEQtViewLoadRequestPrivate::WPEQtViewLoadRequestPrivate): (WPEQtViewLoadRequestPrivate::~WPEQtViewLoadRequestPrivate): * Source/WebKit/UIProcess/API/wpe/qt6/WPEViewQtQuick.cpp: Added. (wpeViewQtQuickDispose): (wpeViewQtQuickRenderBuffer): (wpeViewQtQuickResize): (wpe_view_qtquick_class_init): (wpe_view_qtquick_new): (wpe_view_qtquick_initialize_rendering): (wpe_view_qtquick_render_buffer_to_texture): (wpe_view_qtquick_did_update_scene): (buttonFromEvent): (mouseModifiersFromEvent): (keyboardModifiersFromEvent): (modifiersFromEvent): (wpe_view_dispatch_mouse_press_event): (wpe_view_dispatch_mouse_move_event): (wpe_view_dispatch_mouse_release_event): (wpe_view_dispatch_wheel_event): (wpe_view_dispatch_hover_enter_event): (wpe_view_dispatch_hover_move_event): (wpe_view_dispatch_hover_leave_event): (wpe_view_dispatch_key_press_event): (wpe_view_dispatch_key_release_event): (wpe_view_dispatch_touch_event): * Source/WebKit/UIProcess/API/wpe/qt6/WPEViewQtQuick.h: Added. * Source/WebKit/UIProcess/API/wpe/qt6/qmldir: Renamed from Source/WebKit/UIProcess/API/wpe/qt/qmldir. * Source/cmake/OptionsWPE.cmake: * Tools/MiniBrowser/wpe/CMakeLists.txt: * Tools/MiniBrowser/wpe/qt/CMakeLists.txt: Removed. * Tools/MiniBrowser/wpe/qt5/CMakeLists.txt: Added. * Tools/MiniBrowser/wpe/qt5/main.cpp: Copied from Tools/MiniBrowser/wpe/qt/main.cpp. * Tools/MiniBrowser/wpe/qt5/main.qml: Renamed from Tools/MiniBrowser/wpe/qt/main.qml. * Tools/MiniBrowser/wpe/qt5/qml.qrc: Copied from Tools/MiniBrowser/wpe/qt/qml.qrc. * Tools/MiniBrowser/wpe/qt6/CMakeLists.txt: Added. * Tools/MiniBrowser/wpe/qt6/main.cpp: Renamed from Tools/MiniBrowser/wpe/qt/main.cpp. (main): * Tools/MiniBrowser/wpe/qt6/main.qml: Added. * Tools/MiniBrowser/wpe/qt6/qml.qrc: Renamed from Tools/MiniBrowser/wpe/qt/qml.qrc. * Tools/Scripts/run-qt-wpe-minibrowser: * Tools/Scripts/webkitdirs.pm: (builtDylibPathForName): * Tools/Scripts/webkitpy/style/checker.py: * Tools/TestWebKitAPI/Tests/WPEQt/WPEQtTest.cpp: * Tools/TestWebKitAPI/Tests/WPEQt/WPEQtTest.h: * Tools/TestWebKitAPI/glib/CMakeLists.txt: Canonical link: https://commits.webkit.org/279129@main
a3aa668 to
567bd6a
Compare
|
Committed 279129@main (567bd6a): https://commits.webkit.org/279129@main Reviewed commits have been landed. Closing PR #25197 and removing active labels. |
567bd6a
c701f51
🧪 wpe-wk2🧪 ios-wk2-wpt🧪 api-ios🧪 api-gtk