port ksplash to KPackage

don't link to libplasma anymore
wilder-5.14
Marco Martin 11 years ago
parent 2d603dec1d
commit fdff93f2aa
  1. 3
      ksplash/ksplashqml/CMakeLists.txt
  2. 7
      ksplash/ksplashqml/SplashWindow.cpp

@ -13,7 +13,8 @@ add_executable(ksplashqml ${ksplashqml_SRCS})
target_link_libraries(ksplashqml target_link_libraries(ksplashqml
Qt5::Quick Qt5::Quick
Qt5::DBus Qt5::DBus
KF5::PlasmaQuick KF5::ConfigCore
KF5::Package
) )
install(TARGETS ksplashqml ${INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS ksplashqml ${INSTALL_TARGETS_DEFAULT_ARGS})

@ -28,9 +28,10 @@
#include <QStandardPaths> #include <QStandardPaths>
#include <QSurfaceFormat> #include <QSurfaceFormat>
#include <KSharedConfig> #include <KSharedConfig>
#include <KConfigGroup>
#include <Plasma/Package> #include <KPackage/Package>
#include <Plasma/PluginLoader> #include <KPackage/PackageLoader>
SplashWindow::SplashWindow(bool testing, bool window) SplashWindow::SplashWindow(bool testing, bool window)
: QQuickView(), : QQuickView(),
@ -90,7 +91,7 @@ void SplashWindow::setGeometry(const QRect& rect)
if (oldGeometryEmpty) { 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"); KConfigGroup cg(KSharedConfig::openConfig("kdeglobals"), "KDE");
const QString packageName = cg.readEntry("LookAndFeelPackage", QString()); const QString packageName = cg.readEntry("LookAndFeelPackage", QString());
if (!packageName.isEmpty()) { if (!packageName.isEmpty()) {

Loading…
Cancel
Save