From b68b59dac6f4b70acb56587dc74e3f121f72bc2e Mon Sep 17 00:00:00 2001
From: Alexander Lohnau <alexander.lohnau@gmx.de>
Date: Thu, 24 Mar 2022 18:30:02 +0100
Subject: [PATCH] Remove explicit QuickSettings init method call

This is now done as part of the plasma integration plugin.

Task: https://phabricator.kde.org/T12135
---
 krunner/CMakeLists.txt            | 1 -
 krunner/main.cpp                  | 3 ---
 ksplash/ksplashqml/CMakeLists.txt | 1 -
 ksplash/ksplashqml/splashapp.cpp  | 3 ---
 logout-greeter/main.cpp           | 4 ----
 plasma-windowed/CMakeLists.txt    | 1 -
 plasma-windowed/main.cpp          | 3 ---
 shell/main.cpp                    | 3 ---
 8 files changed, 19 deletions(-)

diff --git a/krunner/CMakeLists.txt b/krunner/CMakeLists.txt
index f12d5e9a7..416480aee 100644
--- a/krunner/CMakeLists.txt
+++ b/krunner/CMakeLists.txt
@@ -23,7 +23,6 @@ target_link_libraries(krunner
     KF5::KCMUtils
     KF5::Crash
     KF5::WaylandClient
-    KF5::QuickAddons
     KF5::Runner
     PW::KWorkspace
 )
diff --git a/krunner/main.cpp b/krunner/main.cpp
index eb40a2773..a05402a01 100644
--- a/krunner/main.cpp
+++ b/krunner/main.cpp
@@ -20,7 +20,6 @@
 #include <KAuthorized>
 #include <KDBusService>
 
-#include <KQuickAddons/QtQuickSettings>
 #include <kdeclarative/qmlobject.h>
 
 #include <kworkspace.h>
@@ -45,8 +44,6 @@ int main(int argc, char **argv)
     }
     KLocalizedString::setApplicationDomain("krunner");
 
-    KQuickAddons::QtQuickSettings::init();
-
     //     TODO: Make it a QGuiApplication once we don't depend on KDELibs4Support
     //     QGuiApplication app(argc, argv);
 
diff --git a/ksplash/ksplashqml/CMakeLists.txt b/ksplash/ksplashqml/CMakeLists.txt
index 8ae6d72bd..76ef96a58 100644
--- a/ksplash/ksplashqml/CMakeLists.txt
+++ b/ksplash/ksplashqml/CMakeLists.txt
@@ -15,7 +15,6 @@ target_link_libraries(ksplashqml
     KF5::Package
     KF5::QuickAddons
     KF5::WindowSystem
-    KF5::QuickAddons
     PW::KWorkspace
     LayerShellQt::Interface
    )
diff --git a/ksplash/ksplashqml/splashapp.cpp b/ksplash/ksplashqml/splashapp.cpp
index e627b4851..a82717e70 100644
--- a/ksplash/ksplashqml/splashapp.cpp
+++ b/ksplash/ksplashqml/splashapp.cpp
@@ -16,7 +16,6 @@
 #include <QPixmap>
 #include <qscreen.h>
 
-#include <KQuickAddons/QtQuickSettings>
 #include <KWindowSystem>
 
 #include <KConfigGroup>
@@ -43,8 +42,6 @@ SplashApp::SplashApp(int &argc, char **argv)
     , m_testing(false)
     , m_window(false)
 {
-    KQuickAddons::QtQuickSettings::init();
-
     QCommandLineParser parser;
     parser.addOption(QCommandLineOption(QStringLiteral("test"), QStringLiteral("Run in test mode")));
     parser.addOption(QCommandLineOption(QStringLiteral("window"), QStringLiteral("Run in windowed mode")));
diff --git a/logout-greeter/main.cpp b/logout-greeter/main.cpp
index fdc395689..47abaa725 100644
--- a/logout-greeter/main.cpp
+++ b/logout-greeter/main.cpp
@@ -10,8 +10,6 @@
 #include <QLibraryInfo>
 #include <QQuickWindow>
 
-#include <KQuickAddons/QtQuickSettings>
-
 #include "ksmserveriface.h"
 
 #include "greeter.h"
@@ -26,8 +24,6 @@ int main(int argc, char *argv[])
     QQuickWindow::setDefaultAlphaBuffer(true);
     QGuiApplication app(argc, argv);
 
-    KQuickAddons::QtQuickSettings::init();
-
     OrgKdeKSMServerInterfaceInterface ksmserver(QStringLiteral("org.kde.ksmserver"), QStringLiteral("/KSMServer"), QDBusConnection::sessionBus());
     QDBusPendingReply<bool> isShuttingDownPending = ksmserver.isShuttingDown();
 
diff --git a/plasma-windowed/CMakeLists.txt b/plasma-windowed/CMakeLists.txt
index 2ad3836dd..1464daf53 100644
--- a/plasma-windowed/CMakeLists.txt
+++ b/plasma-windowed/CMakeLists.txt
@@ -19,7 +19,6 @@ target_link_libraries(
     KF5::I18n
     KF5::IconThemes
     KF5::XmlGui
-    KF5::QuickAddons
     KF5::PlasmaQuick
     KF5::Plasma
     KF5::DBusAddons
diff --git a/plasma-windowed/main.cpp b/plasma-windowed/main.cpp
index b094bfb59..e9c208b3e 100644
--- a/plasma-windowed/main.cpp
+++ b/plasma-windowed/main.cpp
@@ -11,7 +11,6 @@
 
 #include <KDBusService>
 #include <KLocalizedString>
-#include <KQuickAddons/QtQuickSettings>
 
 #include "plasmawindowedcorona.h"
 #include "plasmawindowedview.h"
@@ -28,8 +27,6 @@ int main(int argc, char **argv)
 
     KDBusService service(KDBusService::Unique);
 
-    KQuickAddons::QtQuickSettings::init();
-
     QCommandLineParser parser;
     parser.setApplicationDescription(i18n("Plasma Windowed"));
     parser.addOption(
diff --git a/shell/main.cpp b/shell/main.cpp
index 26afe44e5..26e4ecede 100644
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -19,7 +19,6 @@
 #include <QSessionManager>
 
 #include <KAboutData>
-#include <KQuickAddons/QtQuickSettings>
 
 #ifdef WITH_KUSERFEEDBACKCORE
 #include "userfeedback.h"
@@ -93,8 +92,6 @@ int main(int argc, char *argv[])
     // This does not make much sense for plasmashell.
     app.removeLibraryPath(QCoreApplication::applicationDirPath());
 
-    KQuickAddons::QtQuickSettings::init();
-
     KAboutData aboutData(QStringLiteral("plasmashell"), i18n("Plasma"), QStringLiteral(PROJECT_VERSION), i18n("Plasma Shell"), KAboutLicense::GPL);
 
     KAboutData::setApplicationData(aboutData);