From 3ab4e1a84ac8668406b4bdece1d0c506ab774e52 Mon Sep 17 00:00:00 2001 From: Antonis Tsiapaliokas Date: Tue, 20 Aug 2013 20:12:09 +0300 Subject: [PATCH] make it build and fix linking --- kcmkwin/kwincompositing/CMakeLists.txt | 11 +++++++---- kcmkwin/kwincompositing/main.cpp | 7 +------ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/kcmkwin/kwincompositing/CMakeLists.txt b/kcmkwin/kwincompositing/CMakeLists.txt index 0603196cad..5b1556f844 100644 --- a/kcmkwin/kwincompositing/CMakeLists.txt +++ b/kcmkwin/kwincompositing/CMakeLists.txt @@ -88,11 +88,12 @@ target_link_libraries(kwincompositing ${Qt5Qml_LIBRARIES} ${Qt5Core_LIBARIES} ${kservice_LIBRARIES} + Qt5::DBus + KF5::KI18n + KF5::KService ${Qt5Widgets_LIBRARIES} - ${KDE4_KDECORE_LIBS} ${KDE4_KCMUTILS_LIBS} ${Qt5Test_LIBRARIES} - ${KDE4Support_LIBRARIES} ${KCoreAddons_LIBRARIES}) set(modelTest_SRC @@ -109,13 +110,15 @@ target_link_libraries(effectModelTest ${Qt5Qml_LIBRARIES} ${Qt5Core_LIBARIES} ${kservice_LIBRARIES} + Qt5::DBus + KF5::KI18n + KF5::KService ${Qt5Widgets_LIBRARIES} - ${KDE4_KDECORE_LIBS} ${KDE4_KCMUTILS_LIBS} ${Qt5Test_LIBRARIES} - ${KDE4Support_LIBRARIES} ${KCoreAddons_LIBRARIES}) + INSTALL(DIRECTORY qml DESTINATION ${DATA_INSTALL_DIR}/kwincompositing) INSTALL(TARGETS kwincompositing ${INSTALL_TARGETS_DEFAULT_ARGS}) ################# list the subdirectories ################# diff --git a/kcmkwin/kwincompositing/main.cpp b/kcmkwin/kwincompositing/main.cpp index 4ca0be0e1f..45a18b63a9 100644 --- a/kcmkwin/kwincompositing/main.cpp +++ b/kcmkwin/kwincompositing/main.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include int main(int argc, char *argv[]) { @@ -38,11 +38,6 @@ int main(int argc, char *argv[]) i18n("Author and maintainer"), "kok3rs@gmail.com"); - KCmdLineArgs::init(argc, argv, - "kwincompositing", "", - ki18n("KWinCompositing"), - "0.1"); - QApplication app(argc, argv); KWin::Compositing::EffectView *view = new KWin::Compositing::EffectView();