Remove explicit QuickSettings init method call

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

Task: https://phabricator.kde.org/T12135
wilder-5.25
Alexander Lohnau 4 years ago
parent 43668f4c63
commit b68b59dac6
  1. 1
      krunner/CMakeLists.txt
  2. 3
      krunner/main.cpp
  3. 1
      ksplash/ksplashqml/CMakeLists.txt
  4. 3
      ksplash/ksplashqml/splashapp.cpp
  5. 4
      logout-greeter/main.cpp
  6. 1
      plasma-windowed/CMakeLists.txt
  7. 3
      plasma-windowed/main.cpp
  8. 3
      shell/main.cpp

@ -23,7 +23,6 @@ target_link_libraries(krunner
KF5::KCMUtils KF5::KCMUtils
KF5::Crash KF5::Crash
KF5::WaylandClient KF5::WaylandClient
KF5::QuickAddons
KF5::Runner KF5::Runner
PW::KWorkspace PW::KWorkspace
) )

@ -20,7 +20,6 @@
#include <KAuthorized> #include <KAuthorized>
#include <KDBusService> #include <KDBusService>
#include <KQuickAddons/QtQuickSettings>
#include <kdeclarative/qmlobject.h> #include <kdeclarative/qmlobject.h>
#include <kworkspace.h> #include <kworkspace.h>
@ -45,8 +44,6 @@ int main(int argc, char **argv)
} }
KLocalizedString::setApplicationDomain("krunner"); KLocalizedString::setApplicationDomain("krunner");
KQuickAddons::QtQuickSettings::init();
// TODO: Make it a QGuiApplication once we don't depend on KDELibs4Support // TODO: Make it a QGuiApplication once we don't depend on KDELibs4Support
// QGuiApplication app(argc, argv); // QGuiApplication app(argc, argv);

@ -15,7 +15,6 @@ target_link_libraries(ksplashqml
KF5::Package KF5::Package
KF5::QuickAddons KF5::QuickAddons
KF5::WindowSystem KF5::WindowSystem
KF5::QuickAddons
PW::KWorkspace PW::KWorkspace
LayerShellQt::Interface LayerShellQt::Interface
) )

@ -16,7 +16,6 @@
#include <QPixmap> #include <QPixmap>
#include <qscreen.h> #include <qscreen.h>
#include <KQuickAddons/QtQuickSettings>
#include <KWindowSystem> #include <KWindowSystem>
#include <KConfigGroup> #include <KConfigGroup>
@ -43,8 +42,6 @@ SplashApp::SplashApp(int &argc, char **argv)
, m_testing(false) , m_testing(false)
, m_window(false) , m_window(false)
{ {
KQuickAddons::QtQuickSettings::init();
QCommandLineParser parser; QCommandLineParser parser;
parser.addOption(QCommandLineOption(QStringLiteral("test"), QStringLiteral("Run in test mode"))); parser.addOption(QCommandLineOption(QStringLiteral("test"), QStringLiteral("Run in test mode")));
parser.addOption(QCommandLineOption(QStringLiteral("window"), QStringLiteral("Run in windowed mode"))); parser.addOption(QCommandLineOption(QStringLiteral("window"), QStringLiteral("Run in windowed mode")));

@ -10,8 +10,6 @@
#include <QLibraryInfo> #include <QLibraryInfo>
#include <QQuickWindow> #include <QQuickWindow>
#include <KQuickAddons/QtQuickSettings>
#include "ksmserveriface.h" #include "ksmserveriface.h"
#include "greeter.h" #include "greeter.h"
@ -26,8 +24,6 @@ int main(int argc, char *argv[])
QQuickWindow::setDefaultAlphaBuffer(true); QQuickWindow::setDefaultAlphaBuffer(true);
QGuiApplication app(argc, argv); QGuiApplication app(argc, argv);
KQuickAddons::QtQuickSettings::init();
OrgKdeKSMServerInterfaceInterface ksmserver(QStringLiteral("org.kde.ksmserver"), QStringLiteral("/KSMServer"), QDBusConnection::sessionBus()); OrgKdeKSMServerInterfaceInterface ksmserver(QStringLiteral("org.kde.ksmserver"), QStringLiteral("/KSMServer"), QDBusConnection::sessionBus());
QDBusPendingReply<bool> isShuttingDownPending = ksmserver.isShuttingDown(); QDBusPendingReply<bool> isShuttingDownPending = ksmserver.isShuttingDown();

@ -19,7 +19,6 @@ target_link_libraries(
KF5::I18n KF5::I18n
KF5::IconThemes KF5::IconThemes
KF5::XmlGui KF5::XmlGui
KF5::QuickAddons
KF5::PlasmaQuick KF5::PlasmaQuick
KF5::Plasma KF5::Plasma
KF5::DBusAddons KF5::DBusAddons

@ -11,7 +11,6 @@
#include <KDBusService> #include <KDBusService>
#include <KLocalizedString> #include <KLocalizedString>
#include <KQuickAddons/QtQuickSettings>
#include "plasmawindowedcorona.h" #include "plasmawindowedcorona.h"
#include "plasmawindowedview.h" #include "plasmawindowedview.h"
@ -28,8 +27,6 @@ int main(int argc, char **argv)
KDBusService service(KDBusService::Unique); KDBusService service(KDBusService::Unique);
KQuickAddons::QtQuickSettings::init();
QCommandLineParser parser; QCommandLineParser parser;
parser.setApplicationDescription(i18n("Plasma Windowed")); parser.setApplicationDescription(i18n("Plasma Windowed"));
parser.addOption( parser.addOption(

@ -19,7 +19,6 @@
#include <QSessionManager> #include <QSessionManager>
#include <KAboutData> #include <KAboutData>
#include <KQuickAddons/QtQuickSettings>
#ifdef WITH_KUSERFEEDBACKCORE #ifdef WITH_KUSERFEEDBACKCORE
#include "userfeedback.h" #include "userfeedback.h"
@ -93,8 +92,6 @@ int main(int argc, char *argv[])
// This does not make much sense for plasmashell. // This does not make much sense for plasmashell.
app.removeLibraryPath(QCoreApplication::applicationDirPath()); app.removeLibraryPath(QCoreApplication::applicationDirPath());
KQuickAddons::QtQuickSettings::init();
KAboutData aboutData(QStringLiteral("plasmashell"), i18n("Plasma"), QStringLiteral(PROJECT_VERSION), i18n("Plasma Shell"), KAboutLicense::GPL); KAboutData aboutData(QStringLiteral("plasmashell"), i18n("Plasma"), QStringLiteral(PROJECT_VERSION), i18n("Plasma Shell"), KAboutLicense::GPL);
KAboutData::setApplicationData(aboutData); KAboutData::setApplicationData(aboutData);

Loading…
Cancel
Save