yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[kwin] Remove dependency on KF5Declarative

Browse source 
It's a runtime dependency as PlasmaCore pulls it in automatically,
so we don't it as all the QML we currently ship uses PlasmaCore.
This commit is contained in:
Martin Gräßlin 2014-02-26 08:30:52 +01:00
parent 4586767db8
commit 95ab9d05aa
3 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -242,7 +242,6 @@ set(kwin_QT_LIBS
) )
set(kwin_KDE_LIBS set(kwin_KDE_LIBS
KF5::Declarative
KF5::ConfigCore KF5::ConfigCore
KF5::CoreAddons KF5::CoreAddons
KF5::Crash KF5::Crash

1
scripting/CMakeLists.txt
View file

@ -2,7 +2,6 @@ set(kcm_kwin4_genericscripted_SRCS genericscriptedconfig.cpp)
kde4_add_plugin( kcm_kwin4_genericscripted ${kcm_kwin4_genericscripted_SRCS} ) kde4_add_plugin( kcm_kwin4_genericscripted ${kcm_kwin4_genericscripted_SRCS} )
target_link_libraries( kcm_kwin4_genericscripted target_link_libraries( kcm_kwin4_genericscripted
KF5::ConfigWidgets #KCModule KF5::ConfigWidgets #KCModule
KF5::Declarative
KF5::I18n KF5::I18n
KF5::Service KF5::Service
KF5::Plasma KF5::Plasma

5
scripting/scripting.cpp
View file

@ -35,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <KDE/KConfigGroup> #include <KDE/KConfigGroup>
#include <KDE/KPluginInfo> #include <KDE/KPluginInfo>
#include <KDE/KServiceTypeTrader> #include <KDE/KServiceTypeTrader>
#include <kdeclarative/kdeclarative.h>
// Qt // Qt
#include <QtDBus/QDBusConnection> #include <QtDBus/QDBusConnection>
#include <QtDBus/QDBusMessage> #include <QtDBus/QDBusMessage>
@ -543,10 +542,6 @@ void KWin::DeclarativeScript::run()
if (running()) { if (running()) {
return; return;
} }
KDeclarative::KDeclarative kdeclarative;
kdeclarative.setDeclarativeEngine(m_engine);
kdeclarative.initialize();
kdeclarative.setupBindings();
qmlRegisterType<DesktopThumbnailItem>("org.kde.kwin", 2, 0, "DesktopThumbnailItem"); qmlRegisterType<DesktopThumbnailItem>("org.kde.kwin", 2, 0, "DesktopThumbnailItem");
qmlRegisterType<WindowThumbnailItem>("org.kde.kwin", 2, 0, "ThumbnailItem"); qmlRegisterType<WindowThumbnailItem>("org.kde.kwin", 2, 0, "ThumbnailItem");
qmlRegisterType<DBusCall>("org.kde.kwin", 2, 0, "DBusCall"); qmlRegisterType<DBusCall>("org.kde.kwin", 2, 0, "DBusCall");