alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove kcomponentdata

Browse Source 
we are completely free of KDE$Support now
This commit is contained in:
Marco Martin 2014-02-26 16:17:33 +01:00
parent 6402338ac2
commit a67b3c78f8
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/shell/CMakeLists.txt
View File

@ -17,7 +17,6 @@ find_package(KF5CoreAddons REQUIRED)
find_package(KF5Crash REQUIRED)
find_package(KF5Solid REQUIRED)
find_package(KF5Activities REQUIRED)
find_package(KF5KDE4Support REQUIRED)
find_package(KF5TextEditor REQUIRED)
@ -75,7 +74,6 @@ target_link_libraries(plasma-shell
KF5::Activities
KF5::GlobalAccel
KF5::DBusAddons
KF5::KDE4Support
KF5::TextEditor
)
target_include_directories(plasma-shell PRIVATE "${CMAKE_BINARY_DIR}")

3
src/shell/interactiveconsole.cpp
View File

@ -45,7 +45,6 @@
#include <KTextEditor/Document>
#include <KTextEditor/View>
#include <KToolBar>
#include <KComponentData>
#include <Plasma/Corona>
#include <Plasma/Package>
@ -348,7 +347,7 @@ void InteractiveConsole::populateTemplatesMenu()
QMap<QString, KService::Ptr> sorted;
const QString constraint = QString("[X-Plasma-Shell] == '%1'")
.arg(KComponentData::mainComponent().componentName());
.arg(qApp->applicationName());
KService::List templates = KServiceTypeTrader::self()->query("Plasma/LayoutTemplate", constraint);
foreach (const KService::Ptr &service, templates) {
sorted.insert(service->name(), service);