marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-08-02 17:54:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some qt6 compile errors

Browse source
This commit is contained in:
Laurent Montel 2022-04-24 13:44:41 +02:00
parent c6b55a9534
commit 401620e365
13 changed files with 19 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -77,7 +77,7 @@ include(CheckIncludeFiles)
plasma_install_package(look-and-feel org.kde.plasma.phone look-and-feel) plasma_install_package(look-and-feel org.kde.plasma.phone look-and-feel)
plasma_install_package(shell org.kde.plasma.phoneshell shells) 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(bin)
add_subdirectory(containments) add_subdirectory(containments)

2
components/mmplugin/CMakeLists.txt
View file

@ -8,7 +8,7 @@ target_sources(ppc-mmqmlplugin PRIVATE
) )
target_link_libraries(ppc-mmqmlplugin target_link_libraries(ppc-mmqmlplugin
Qt5::Qml Qt::Qml
KF5::ModemManagerQt KF5::ModemManagerQt
KF5::NetworkManagerQt KF5::NetworkManagerQt
) )

2
components/mmplugin/signalindicator.h
View file

@ -5,7 +5,7 @@
#pragma once #pragma once
#include <ModemManagerQt/Manager> #include <ModemManagerQt/Manager>
#include <ModemManagerQt/modem3gpp.h> #include <ModemManagerQt/Modem3Gpp>
#include <NetworkManagerQt/Connection> #include <NetworkManagerQt/Connection>
#include <NetworkManagerQt/ModemDevice> #include <NetworkManagerQt/ModemDevice>

1
components/mobileshell/homescreen/applicationlistmodel.cpp
View file

@ -31,7 +31,6 @@
#include <KWayland/Client/surface.h> #include <KWayland/Client/surface.h>
#include <Plasma/Applet> #include <Plasma/Applet>
#include <PlasmaQuick/AppletQuickItem>
constexpr int MAX_FAVOURITES = 5; constexpr int MAX_FAVOURITES = 5;

6
components/mobileshell/homescreen/applicationlistmodel.h
View file

@ -8,6 +8,7 @@
#pragma once #pragma once
// Qt // Qt
#include <PlasmaQuick/AppletQuickItem>
#include <QAbstractListModel> #include <QAbstractListModel>
#include <QList> #include <QList>
#include <QObject> #include <QObject>
@ -25,11 +26,6 @@ class PlasmaWindow;
} }
} }
namespace PlasmaQuick
{
class AppletQuickItem;
}
class ApplicationListModel; class ApplicationListModel;
class ApplicationListModel : public QAbstractListModel class ApplicationListModel : public QAbstractListModel

4
containments/homescreen/homescreen.cpp
View file

@ -10,8 +10,8 @@
#include <QQuickItem> #include <QQuickItem>
#include <QtQml> #include <QtQml>
HomeScreen::HomeScreen(QObject *parent, const QVariantList &args) HomeScreen::HomeScreen(QObject *parent, const KPluginMetaData &data, const QVariantList &args)
: Plasma::Containment(parent, args) : Plasma::Containment(parent, data, args)
{ {
setHasConfigurationInterface(true); setHasConfigurationInterface(true);
connect(KWindowSystem::self(), &KWindowSystem::showingDesktopChanged, this, &HomeScreen::showingDesktopChanged); connect(KWindowSystem::self(), &KWindowSystem::showingDesktopChanged, this, &HomeScreen::showingDesktopChanged);

2
containments/homescreen/homescreen.h
View file

@ -14,7 +14,7 @@ class HomeScreen : public Plasma::Containment
Q_PROPERTY(bool showingDesktop READ showingDesktop WRITE setShowingDesktop NOTIFY showingDesktopChanged) Q_PROPERTY(bool showingDesktop READ showingDesktop WRITE setShowingDesktop NOTIFY showingDesktopChanged)
public: public:
HomeScreen(QObject *parent, const QVariantList &args); HomeScreen(QObject *parent, const KPluginMetaData &data, const QVariantList &args);
~HomeScreen() override; ~HomeScreen() override;
void configChanged() override; void configChanged() override;

4
containments/panel/phonepanel.cpp
View file

@ -7,8 +7,8 @@
#include "phonepanel.h" #include "phonepanel.h"
PhonePanel::PhonePanel(QObject *parent, const QVariantList &args) PhonePanel::PhonePanel(QObject *parent, const KPluginMetaData &data, const QVariantList &args)
: Plasma::Containment(parent, args) : Plasma::Containment(parent, data, args)
{ {
} }

2
containments/panel/phonepanel.h
View file

@ -14,7 +14,7 @@ class PhonePanel : public Plasma::Containment
Q_OBJECT Q_OBJECT
public: public:
PhonePanel(QObject *parent, const QVariantList &args); PhonePanel(QObject *parent, const KPluginMetaData &data, const QVariantList &args);
~PhonePanel() override; ~PhonePanel() override;
}; };

4
containments/taskpanel/taskpanel.cpp
View file

@ -21,8 +21,8 @@
#include <virtualkeyboardinterface.h> #include <virtualkeyboardinterface.h>
TaskPanel::TaskPanel(QObject *parent, const QVariantList &args) TaskPanel::TaskPanel(QObject *parent, const KPluginMetaData &data, const QVariantList &args)
: Plasma::Containment(parent, args) : Plasma::Containment(parent, data, args)
{ {
setHasConfigurationInterface(true); setHasConfigurationInterface(true);
initWayland(); initWayland();

3
containments/taskpanel/taskpanel.h
View file

@ -8,6 +8,7 @@
#define TASKPANEL_H #define TASKPANEL_H
#include <Plasma/Containment> #include <Plasma/Containment>
#include <QWindow>
class OutputsModel; class OutputsModel;
class QAbstractItemModel; class QAbstractItemModel;
@ -31,7 +32,7 @@ class TaskPanel : public Plasma::Containment
Q_PROPERTY(QWindow *panel READ panel WRITE setPanel NOTIFY panelChanged) Q_PROPERTY(QWindow *panel READ panel WRITE setPanel NOTIFY panelChanged)
public: public:
TaskPanel(QObject *parent, const QVariantList &args); TaskPanel(QObject *parent, const KPluginMetaData &data, const QVariantList &args);
QWindow *panel(); QWindow *panel();
void setPanel(QWindow *panel); void setPanel(QWindow *panel);

8
kcms/mobileshell/CMakeLists.txt
View file

@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.0)
project(mobileshellkcm) project(mobileshellkcm)
set(QT_MIN_VERSION "5.15.0") 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) find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
@ -15,7 +15,7 @@ include(KDEInstallDirs)
include(KDECMakeSettings) include(KDECMakeSettings)
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) 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 Quick
Svg Svg
) )
@ -34,7 +34,7 @@ set(mobileshellsettings_SRCS
add_library(kcm_mobileshell MODULE ${mobileshellsettings_SRCS}) add_library(kcm_mobileshell MODULE ${mobileshellsettings_SRCS})
target_link_libraries(kcm_mobileshell target_link_libraries(kcm_mobileshell
Qt5::Core Qt::Core
KF5::CoreAddons KF5::CoreAddons
KF5::KCMUtils KF5::KCMUtils
KF5::I18n KF5::I18n
@ -44,7 +44,7 @@ target_link_libraries(kcm_mobileshell
kcoreaddons_desktop_to_json(kcm_mobileshell "package/metadata.desktop") kcoreaddons_desktop_to_json(kcm_mobileshell "package/metadata.desktop")
install(TARGETS kcm_mobileshell DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms) 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. kpackage_install_package(package kcm_mobileshell kcms) # Install our QML kpackage.

2
kcms/mobileshell/kcm.cpp
View file

@ -12,7 +12,7 @@ K_PLUGIN_CLASS_WITH_JSON(KCMMobileShell, "metadata.json")
KCMMobileShell::KCMMobileShell(QObject *parent, const KPluginMetaData &data, const QVariantList &args) KCMMobileShell::KCMMobileShell(QObject *parent, const KPluginMetaData &data, const QVariantList &args)
: KQuickAddons::ManagedConfigModule(parent, data, args) : KQuickAddons::ManagedConfigModule(parent, data, args)
{ {
setButtons(0); setButtons({});
} }
#include "kcm.moc" #include "kcm.moc"