From 1d350ee6c0541ea6df0e50090c65b4c6428ed8a0 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Wed, 11 Jan 2017 17:36:11 +0200 Subject: [PATCH] move iconitem from app to plugin --- app/CMakeLists.txt | 2 -- liblattedock/CMakeLists.txt | 8 ++++++++ {app => liblattedock}/iconitem.cpp | 0 {app => liblattedock}/iconitem.h | 0 liblattedock/lattedockplugin.cpp | 2 ++ 5 files changed, 10 insertions(+), 2 deletions(-) rename {app => liblattedock}/iconitem.cpp (100%) rename {app => liblattedock}/iconitem.h (100%) diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 998bc8ed8..d6e7b6a91 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -26,7 +26,6 @@ set(lattedock-app_SRCS dockview.cpp dockconfigview.cpp packageplugins/shell/dockpackage.cpp - iconitem.cpp main.cpp ) @@ -49,7 +48,6 @@ target_link_libraries( KF5::Activities KF5::QuickAddons KF5::WindowSystem - KF5::IconThemes ) install(TARGETS latte-dock ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/liblattedock/CMakeLists.txt b/liblattedock/CMakeLists.txt index ca280ff4a..64b185222 100644 --- a/liblattedock/CMakeLists.txt +++ b/liblattedock/CMakeLists.txt @@ -6,6 +6,9 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS Quick Qml) find_package(KF5 REQUIRED COMPONENTS WindowSystem CoreAddons + Plasma + PlasmaQuick + IconThemes ) set(CMAKE_AUTOMOC ON) @@ -14,6 +17,7 @@ set(lattedock_SRCS lattedockplugin.cpp windowsystem.cpp dock.cpp + iconitem.cpp ) add_library(lattedockplugin SHARED ${lattedock_SRCS}) @@ -23,6 +27,10 @@ target_link_libraries(lattedockplugin Qt5::Qml KF5::WindowSystem KF5::CoreAddons + KF5::Plasma + KF5::PlasmaQuick + KF5::QuickAddons + KF5::IconThemes ) install(TARGETS lattedockplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/latte) diff --git a/app/iconitem.cpp b/liblattedock/iconitem.cpp similarity index 100% rename from app/iconitem.cpp rename to liblattedock/iconitem.cpp diff --git a/app/iconitem.h b/liblattedock/iconitem.h similarity index 100% rename from app/iconitem.h rename to liblattedock/iconitem.h diff --git a/liblattedock/lattedockplugin.cpp b/liblattedock/lattedockplugin.cpp index 3e7e7911f..1622ca67d 100644 --- a/liblattedock/lattedockplugin.cpp +++ b/liblattedock/lattedockplugin.cpp @@ -21,6 +21,7 @@ #include "lattedockplugin.h" #include "windowsystem.h" #include "dock.h" +#include "iconitem.h" #include @@ -31,4 +32,5 @@ void LatteDockPlugin::registerTypes(const char *uri) qmlRegisterUncreatableType(uri, 0, 1, "Dock", "Latte Dock Types uncreatable"); qmlRegisterType(uri, 0, 1, "WindowSystem"); + qmlRegisterType(uri, 0, 1, "IconItem"); }