feat: attempt to support Qt 6.6.2 - #231
Closed
felixonmars wants to merge 1 commit into
Closed
Conversation
QXcbWindow now inherits from QObject, this makes the plain parent() call
ambigious and breaks `VtableHook::callOriginalFun`. I am not sure if the
changes here are correct, but it at least compiles and dde-launchpad
seems to working correctly.
Also accepts QT_XCB_PRIVATE_HEADERS for Qt 6.x builds.
```
-class Q_XCB_EXPORT QXcbWindow : public QXcbObject, public QXcbWindowEventListener, public QPlatformWindow
+class Q_XCB_EXPORT QXcbWindow : public QObject, public QXcbObject, public QXcbWindowEventListener, public QPlatformWindow
, public QNativeInterface::Private::QXcbWindow
{
+ Q_OBJECT
```
deepin-ci-robot
added a commit
to linuxdeepin/qt6platform-plugins
that referenced
this pull request
Feb 15, 2024
Synchronize source files from linuxdeepin/qt5platform-plugins. Source-pull-request: linuxdeepin/qt5platform-plugins#231
kegechen
approved these changes
Feb 18, 2024
Contributor
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: felixonmars, kegechen The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
zccrs
requested changes
Feb 20, 2024
| } | ||
|
|
||
| VtableHook::callOriginalFun(window, &QXcbWindow::handleFocusInEvent, event); | ||
| window->QXcbWindow::handleFocusInEvent(event); |
Member
There was a problem hiding this comment.
这里不行，会形成死循环。如果这里有问题，可以看看 dtkcore 里的 DVtableHook 的单测能不能跑得通
zccrs
pushed a commit
that referenced
this pull request
Feb 20, 2024
* feat: attempt to support Qt 6.6.2
QXcbWindow now inherits from QObject, this makes the plain parent() call
ambigious and breaks `VtableHook::callOriginalFun`. I am not sure if the
changes here are correct, but it at least compiles and dde-launchpad
seems to working correctly.
Also accepts QT_XCB_PRIVATE_HEADERS for Qt 6.x builds.
```
-class Q_XCB_EXPORT QXcbWindow : public QXcbObject, public QXcbWindowEventListener, public QPlatformWindow
+class Q_XCB_EXPORT QXcbWindow : public QObject, public QXcbObject, public QXcbWindowEventListener, public QPlatformWindow
, public QNativeInterface::Private::QXcbWindow
{
+ Q_OBJECT
```
* another clean fix on qt 6.6.2
* xcb: improve qt6 private header inclusion handling
---------
Co-authored-by: Felix Yan <felixonmars@archlinux.org>
Contributor
|
TAG Bot New tag: 5.6.25 |
Contributor
|
TAG Bot New tag: 5.6.26 |
Contributor
|
TAG Bot New tag: 5.6.27 |
Member
Author
|
Superseded by #232 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
QXcbWindow now inherits from QObject, this makes the plain parent() call ambigious and breaks
VtableHook::callOriginalFun. I am not sure if the changes here are correct, but it at least compiles and dde-launchpad seems to working correctly.Also accepts QT_XCB_PRIVATE_HEADERS for Qt 6.x builds.