Commit 401620e3 authored by Laurent Montel's avatar Laurent Montel
Browse files

Fix some qt6 compile errors

parent c6b55a95
Pipeline #167836 passed with stages
in 1 minute and 36 seconds
......@@ -77,7 +77,7 @@ include(CheckIncludeFiles)
plasma_install_package(look-and-feel org.kde.plasma.phone look-and-feel)
plasma_install_package(shell org.kde.plasma.phoneshell shells)
install(FILES plasma_phone_components.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR})
install(FILES plasma_phone_components.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})
add_subdirectory(bin)
add_subdirectory(containments)
......
......@@ -8,7 +8,7 @@ target_sources(ppc-mmqmlplugin PRIVATE
)
target_link_libraries(ppc-mmqmlplugin
Qt5::Qml
Qt::Qml
KF5::ModemManagerQt
KF5::NetworkManagerQt
)
......
......@@ -5,7 +5,7 @@
#pragma once
#include <ModemManagerQt/Manager>
#include <ModemManagerQt/modem3gpp.h>
#include <ModemManagerQt/Modem3Gpp>
#include <NetworkManagerQt/Connection>
#include <NetworkManagerQt/ModemDevice>
......
......@@ -31,7 +31,6 @@
#include <KWayland/Client/surface.h>
#include <Plasma/Applet>
#include <PlasmaQuick/AppletQuickItem>
constexpr int MAX_FAVOURITES = 5;
......
......@@ -8,6 +8,7 @@
#pragma once
// Qt
#include <PlasmaQuick/AppletQuickItem>
#include <QAbstractListModel>
#include <QList>
#include <QObject>
......@@ -25,11 +26,6 @@ class PlasmaWindow;
}
}
namespace PlasmaQuick
{
class AppletQuickItem;
}
class ApplicationListModel;
class ApplicationListModel : public QAbstractListModel
......
......@@ -10,8 +10,8 @@
#include <QQuickItem>
#include <QtQml>
HomeScreen::HomeScreen(QObject *parent, const QVariantList &args)
: Plasma::Containment(parent, args)
HomeScreen::HomeScreen(QObject *parent, const KPluginMetaData &data, const QVariantList &args)
: Plasma::Containment(parent, data, args)
{
setHasConfigurationInterface(true);
connect(KWindowSystem::self(), &KWindowSystem::showingDesktopChanged, this, &HomeScreen::showingDesktopChanged);
......
......@@ -14,7 +14,7 @@ class HomeScreen : public Plasma::Containment
Q_PROPERTY(bool showingDesktop READ showingDesktop WRITE setShowingDesktop NOTIFY showingDesktopChanged)
public:
HomeScreen(QObject *parent, const QVariantList &args);
HomeScreen(QObject *parent, const KPluginMetaData &data, const QVariantList &args);
~HomeScreen() override;
void configChanged() override;
......
......@@ -7,8 +7,8 @@
#include "phonepanel.h"
PhonePanel::PhonePanel(QObject *parent, const QVariantList &args)
: Plasma::Containment(parent, args)
PhonePanel::PhonePanel(QObject *parent, const KPluginMetaData &data, const QVariantList &args)
: Plasma::Containment(parent, data, args)
{
}
......
......@@ -14,7 +14,7 @@ class PhonePanel : public Plasma::Containment
Q_OBJECT
public:
PhonePanel(QObject *parent, const QVariantList &args);
PhonePanel(QObject *parent, const KPluginMetaData &data, const QVariantList &args);
~PhonePanel() override;
};
......
......@@ -21,8 +21,8 @@
#include <virtualkeyboardinterface.h>
TaskPanel::TaskPanel(QObject *parent, const QVariantList &args)
: Plasma::Containment(parent, args)
TaskPanel::TaskPanel(QObject *parent, const KPluginMetaData &data, const QVariantList &args)
: Plasma::Containment(parent, data, args)
{
setHasConfigurationInterface(true);
initWayland();
......
......@@ -8,6 +8,7 @@
#define TASKPANEL_H
#include <Plasma/Containment>
#include <QWindow>
class OutputsModel;
class QAbstractItemModel;
......@@ -31,7 +32,7 @@ class TaskPanel : public Plasma::Containment
Q_PROPERTY(QWindow *panel READ panel WRITE setPanel NOTIFY panelChanged)
public:
TaskPanel(QObject *parent, const QVariantList &args);
TaskPanel(QObject *parent, const KPluginMetaData &data, const QVariantList &args);
QWindow *panel();
void setPanel(QWindow *panel);
......
......@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.0)
project(mobileshellkcm)
set(QT_MIN_VERSION "5.15.0")
set(KF5_MIN_VERSION "5.86.0")
set(KF5_MIN_VERSION "5.90.0")
find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
......@@ -15,7 +15,7 @@ include(KDEInstallDirs)
include(KDECMakeSettings)
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
Quick
Svg
)
......@@ -34,7 +34,7 @@ set(mobileshellsettings_SRCS
add_library(kcm_mobileshell MODULE ${mobileshellsettings_SRCS})
target_link_libraries(kcm_mobileshell
Qt5::Core
Qt::Core
KF5::CoreAddons
KF5::KCMUtils
KF5::I18n
......@@ -44,7 +44,7 @@ target_link_libraries(kcm_mobileshell
kcoreaddons_desktop_to_json(kcm_mobileshell "package/metadata.desktop")
install(TARGETS kcm_mobileshell DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms)
install(FILES package/metadata.desktop RENAME kcm_mobileshell.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) # Install the desktop file
install(FILES package/metadata.desktop RENAME kcm_mobileshell.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR}) # Install the desktop file
kpackage_install_package(package kcm_mobileshell kcms) # Install our QML kpackage.
......@@ -12,7 +12,7 @@ K_PLUGIN_CLASS_WITH_JSON(KCMMobileShell, "metadata.json")
KCMMobileShell::KCMMobileShell(QObject *parent, const KPluginMetaData &data, const QVariantList &args)
: KQuickAddons::ManagedConfigModule(parent, data, args)
{
setButtons(0);
setButtons({});
}
#include "kcm.moc"
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment