Skip to content

Additional fixes for Qt6 support #122

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.

Sign up for GitHub

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

Open
Lorac wants to merge 3 commits into
base: qt6-support
Choose a base branch
from
Open

Additional fixes for Qt6 support #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39c3f01
common: namespace: add missing include QList
Lorac Jun 11, 2024
b84e082
maliitpluginsconfig: fix for qt6
Lorac Jun 11, 2024
d120259
shellintegration: qwaylandinputpanelshellintegration: migrate for qt6
Lorac Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,11 @@ endif()

if(Qt6_FOUND)
set(QT_VERSION_MAJOR 6)
set(QT_MIN_VERSION "6.0.0")
else()
find_package(Qt5 REQUIRED COMPONENTS Core DBus Gui Quick)
set(QT_VERSION_MAJOR 5)
set(QT_MIN_VERSION "5.14")
endif()

if(NOT DEFINED QT_PLUGINS_INSTALL_DIR)
Expand All @@ -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)
Copy link
Contributor

@dobey dobey Oct 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link

@JamiKettunen JamiKettunen Dec 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I dropped this whole diff to CMakeLists.txt to get this PR applying on top of #125 and everything builds on my end anyway.

endif()
find_package(WaylandProtocols REQUIRED PRIVATE)
find_package(QtWaylandScanner REQUIRED)
Expand Down
1 change: 1 addition & 0 deletions common/maliit/namespace.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

#include <QMetaType>
#include <QSharedPointer>
#include <QList>
Copy link
Contributor

@dobey dobey Oct 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why was this needed exactly?

Copy link

@JamiKettunen JamiKettunen Dec 29, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.


//! \ingroup common
namespace Maliit {
Expand Down
8 changes: 4 additions & 4 deletions src/MaliitPluginsConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
include(CMakeFindDependencyMacro)

find_dependency(Qt5Core @Qt5Core_VERSION@)
find_dependency(Qt5Gui @Qt5Gui_VERSION@)
find_dependency(Qt5Quick @Qt5Quick_VERSION@)
find_dependency(Qt@QT_VERSION_MAJOR@Core @QT_MIN_VERSION@)
find_dependency(Qt@QT_VERSION_MAJOR@Gui @QT_MIN_VERSION@)
find_dependency(Qt@QT_VERSION_MAJOR@Quick @QT_MIN_VERSION@)

include("${CMAKE_CURRENT_LIST_DIR}/MaliitPluginsTargets.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/MaliitPluginsTargets.cmake")
17 changes: 3 additions & 14 deletions src/qt/plugins/shellintegration/qwaylandinputpanelshellintegration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
* Copyright (c) 2017 Jan Arne Petersen
*
* This library is free software; you can redistribute it and/or
Expand All @@ -14,23 +14,16 @@

#include "qwaylandinputpanelsurface.h"

QT_BEGIN_NAMESPACE

namespace QtWaylandClient
{

QWaylandInputPanelShellIntegration::QWaylandInputPanelShellIntegration()
: QWaylandShellIntegration()
{
}
: QWaylandShellIntegrationTemplate(1) {}

QWaylandInputPanelShellIntegration::~QWaylandInputPanelShellIntegration()
{
}

bool QWaylandInputPanelShellIntegration::initialize(QWaylandDisplay *display)
{
auto result = QWaylandShellIntegration::initialize(display);
auto result = QWaylandShellIntegrationTemplate::initialize(display);
const auto globals = display->globals();
for (auto global: globals) {
if (global.interface == QLatin1String("zwp_input_panel_v1")) {
Expand All @@ -48,7 +41,3 @@ QWaylandInputPanelShellIntegration::createShellSurface(QWaylandWindow *window)

return new QWaylandInputPanelSurface(ip_surface, window);
}

}

QT_END_NAMESPACE
21 changes: 8 additions & 13 deletions src/qt/plugins/shellintegration/qwaylandinputpanelshellintegration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
* Copyright (c) 2017 Jan Arne Petersen
*
* This library is free software; you can redistribute it and/or
Expand All @@ -11,17 +11,16 @@
#ifndef QWAYLANDINPUTPANELSHELLINTEGRATION_H
#define QWAYLANDINPUTPANELSHELLINTEGRATION_H

#include <QtWaylandClient/private/qwaylandshellintegration_p.h>

#include "qwayland-input-method-unstable-v1.h"
#include <QtWaylandClient/private/qwayland-text-input-unstable-v1.h>
#include <QtWaylandClient/private/qwaylandclientshellapi_p.h>

QT_BEGIN_NAMESPACE

namespace QtWaylandClient
{
using namespace QtWaylandClient;

class QWaylandInputPanelShellIntegration: public QWaylandShellIntegration
{
class QWaylandInputPanelShellIntegration
: public QWaylandShellIntegrationTemplate<
QWaylandInputPanelShellIntegration>,
public QtWayland::zwp_text_input_manager_v1 {
Copy link
Contributor

@dobey dobey Oct 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

public:
QWaylandInputPanelShellIntegration();
~QWaylandInputPanelShellIntegration() override;
Expand All @@ -33,8 +32,4 @@ class QWaylandInputPanelShellIntegration: public QWaylandShellIntegration
QScopedPointer<QtWayland::zwp_input_panel_v1> m_panel;
};

}

QT_END_NAMESPACE

#endif //QWAYLANDINPUTPANELSHELLINTEGRATION_H