Additional fixes for Qt6 support #122
Open
Conversation
This file contains 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
pvuorela
reviewed
Jun 15, 2024
Otherwise Q_DECLARE_METATYPE can't see the QList type and complains about incomplete type
Lorac
force-pushed
the
qt6-patches-wayland
branch
from
d7b04e8 to
d120259
Compare
aberaud
approved these changes
Jun 27, 2024
|
@aberaud Merge? |
dobey
requested changes
Oct 6, 2024
| @@ -54,7 +56,7 @@ if(enable-wayland) | |||
| if (Qt6_FOUND) | |||
| find_package(Qt6 REQUIRED COMPONENTS WaylandClient WaylandGlobalPrivate) | |||
| else() | |||
| find_package(Qt5 5.14 REQUIRED COMPONENTS WaylandClient XkbCommonSupport) | |||
| find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS WaylandClient XkbCommonSupport) | |||
There was a problem hiding this comment.
The changes in this file seem unnecessary? The define for the Qt6 case is not used anywhere, and the Qt5 one is only used here, where there won't be any newer minor releases.
There was a problem hiding this comment.
I dropped this whole diff to CMakeLists.txt to get this PR applying on top of #125 and everything builds on my end anyway.
| @@ -16,6 +16,7 @@ | |||
|
|
|||
| #include <QMetaType> | |||
| #include <QSharedPointer> | |||
| #include <QList> | |||
There was a problem hiding this comment.
Both framework/keyboard still compile fine without it on Qt 6.8.1 for me without any related warnings with LLVM/Clang 19.1.6 so seems unneeded.
| class QWaylandInputPanelShellIntegration | ||
| : public QWaylandShellIntegrationTemplate< | ||
| QWaylandInputPanelShellIntegration>, | ||
| public QtWayland::zwp_text_input_manager_v1 { |
There was a problem hiding this comment.
Can you explain all of these changes in the input panel shell plugin? It's not clear to me why any of these changes are necessary.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
We are in the process of integrating maliit-keyboard into our custom distro with KDE (plasma-mobile), which only supports Qt6 with the KWin compositor.
These are the patches that I had to make so that the keyboard would appear when using a QML input item.
I'm unsure about the changes applied to QWaylandInputPanelShellIntegration, mainly the inheritance with
zwp_text_input_manager_v1. I couldn't find something better suited unless you want to write something custom.I mainly followed the Qt6 example shell https://doc.qt.io/qt-6/qtwaylandcompositor-custom-shell-example.html