From 08227b02d804e201298a9eefc4f01753882e74cc Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Fri, 25 Sep 2015 01:50:19 +0000
Subject: [PATCH] generic: misc cleanups

---
 kcontrol/smartcard/CMakeLists.txt                        |  7 +------
 kwalletd/CMakeLists.txt                                  |  2 --
 libs/plasmagenericshell/tests/CMakeLists.txt             |  4 +++-
 plasma/desktop/applets/homerun/tests/auto/CMakeLists.txt | 14 +++-----------
 4 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/kcontrol/smartcard/CMakeLists.txt b/kcontrol/smartcard/CMakeLists.txt
index c7c8ab69..75cd6ae1 100644
--- a/kcontrol/smartcard/CMakeLists.txt
+++ b/kcontrol/smartcard/CMakeLists.txt
@@ -3,15 +3,10 @@
 
 ########### next target ###############
 
-set(kcm_smartcard_PART_SRCS smartcard.cpp )
-
-
-kde4_add_ui_files(kcm_smartcard_PART_SRCS smartcardbase.ui nosmartcardbase.ui )
-
+set(kcm_smartcard_PART_SRCS smartcard.cpp smartcardbase.ui nosmartcardbase.ui )
 
 kde4_add_plugin(kcm_smartcard ${kcm_smartcard_PART_SRCS})
 
-
 target_link_libraries(kcm_smartcard   ksmartcard ${KDE4_KIO_LIBS} )
 
 install(TARGETS kcm_smartcard  DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/kwalletd/CMakeLists.txt b/kwalletd/CMakeLists.txt
index 4ba153a7..6c5b2077 100644
--- a/kwalletd/CMakeLists.txt
+++ b/kwalletd/CMakeLists.txt
@@ -38,8 +38,6 @@ if (GPGME_FOUND AND QGPGME_FOUND)
     set(kwalletd_SRCS
         ${kwalletd_SRCS}
         knewwalletdialog.cpp
-    )
-    kde4_add_ui_files(kwalletd_SRCS
         kwalletwizardpagepasswordgpg.ui
         kwalletwizardpagegpgkey.ui
         knewwalletdialogintro.ui
diff --git a/libs/plasmagenericshell/tests/CMakeLists.txt b/libs/plasmagenericshell/tests/CMakeLists.txt
index 0385393f..0035d9d2 100644
--- a/libs/plasmagenericshell/tests/CMakeLists.txt
+++ b/libs/plasmagenericshell/tests/CMakeLists.txt
@@ -21,9 +21,11 @@ set(backgrounddialog_SRCS
     ../mouseplugins.cpp
     ../mousepluginwidget.cpp
     ../wallpaperpreview.cpp
+    ../MousePlugins.ui
+    ../MousePlugins.ui
+    ../BackgroundDialog.ui
 )
 
-kde4_add_ui_files(backgrounddialog_SRCS ../MousePlugins.ui ../MousePlugins.ui ../BackgroundDialog.ui)
 kde4_add_kcfg_files(backgrounddialog_SRCS ../../../plasma/desktop/shell/data/plasma-shell-desktop.kcfgc)
 
 add_executable(plasmabackgrounddialog ${backgrounddialog_SRCS})
diff --git a/plasma/desktop/applets/homerun/tests/auto/CMakeLists.txt b/plasma/desktop/applets/homerun/tests/auto/CMakeLists.txt
index f593fd26..c8f6d754 100644
--- a/plasma/desktop/applets/homerun/tests/auto/CMakeLists.txt
+++ b/plasma/desktop/applets/homerun/tests/auto/CMakeLists.txt
@@ -5,19 +5,11 @@ macro(homerun_add_unit_test _test)
     set(_src ${_cpp}.cpp)
     set(_ui "")
     foreach(_name ${ARGN})
-        if(${_name} MATCHES "\\.ui$")
-            set(_ui ${_ui} ${_name})
-        else()
-            set(_src ${_src} ${_name})
-        endif()
+        set(_src ${_src} ${_name})
     endforeach()
 
-    if(_ui)
-        kde4_add_ui_files(_src ${_ui})
-    endif()
-    qt4_automoc(${_src})
-    kde4_add_unit_test(${_test} ${_src})
-    target_link_libraries(${_test}
+    kde4_add_test(homerun-${_test} ${_src})
+    target_link_libraries(homerun-${_test}
         ${KDE4_PLASMA_LIBS}
         ${KDE4_KFILE_LIBS}
         ${KDE4_KIO_LIBS}
-- 
2.11.0