From fdff93f2aae94899844b1ae8bc65a35edc1dc0a1 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Fri, 9 Jan 2015 13:08:51 +0100 Subject: [PATCH] port ksplash to KPackage don't link to libplasma anymore --- ksplash/ksplashqml/CMakeLists.txt | 3 ++- ksplash/ksplashqml/SplashWindow.cpp | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ksplash/ksplashqml/CMakeLists.txt b/ksplash/ksplashqml/CMakeLists.txt index 16c58a01b..e77cfa91a 100644 --- a/ksplash/ksplashqml/CMakeLists.txt +++ b/ksplash/ksplashqml/CMakeLists.txt @@ -13,7 +13,8 @@ add_executable(ksplashqml ${ksplashqml_SRCS}) target_link_libraries(ksplashqml Qt5::Quick Qt5::DBus - KF5::PlasmaQuick + KF5::ConfigCore + KF5::Package ) install(TARGETS ksplashqml ${INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/ksplash/ksplashqml/SplashWindow.cpp b/ksplash/ksplashqml/SplashWindow.cpp index 807dc9b74..22db2891f 100644 --- a/ksplash/ksplashqml/SplashWindow.cpp +++ b/ksplash/ksplashqml/SplashWindow.cpp @@ -28,9 +28,10 @@ #include #include #include +#include -#include -#include +#include +#include SplashWindow::SplashWindow(bool testing, bool window) : QQuickView(), @@ -90,7 +91,7 @@ void SplashWindow::setGeometry(const QRect& rect) if (oldGeometryEmpty) { - Plasma::Package package = Plasma::PluginLoader::self()->loadPackage("Plasma/LookAndFeel"); + KPackage::Package package = KPackage::PackageLoader::self()->loadPackage("Plasma/LookAndFeel"); KConfigGroup cg(KSharedConfig::openConfig("kdeglobals"), "KDE"); const QString packageName = cg.readEntry("LookAndFeelPackage", QString()); if (!packageName.isEmpty()) {