generic: misc cleanups

diff --git a/drkonqi/tests/crashtest/CMakeLists.txt b/drkonqi/tests/crashtest/CMakeLists.txt
index 06ffb1e..3f1d5e4 100644 (file)
--- a/drkonqi/tests/crashtest/CMakeLists.txt
+++ b/drkonqi/tests/crashtest/CMakeLists.txt
@@ -1,9 +1,5 @@
-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-
 set(crashtest_SRCS crashtest.cpp )
 
+kde4_add_manual_test(crashtest ${crashtest_SRCS})
 
-add_executable(crashtest TEST ${crashtest_SRCS})
-
-target_link_libraries(crashtest  ${KDE4_KDEUI_LIBS} )
-
+target_link_libraries(crashtest ${KDE4_KDEUI_LIBS})

diff --git a/kcmshell/main.cpp b/kcmshell/main.cpp
index 21ef9b9..d2bbbe1 100644 (file)
--- a/kcmshell/main.cpp
+++ b/kcmshell/main.cpp
@@ -244,9 +244,6 @@ int main(int _argc, char *_argv[])
         if (!service) {
             service = locateModule("kcm_" + arg);
         }
-        if (!service) {
-            service = locateModule("kcm" + arg);
-        }
 
         if (service) {
             modules.append(service);

diff --git a/kmimetypefinder/kmimetypefinder.cpp b/kmimetypefinder/kmimetypefinder.cpp
index e1693ef..7f29205 100644 (file)
--- a/kmimetypefinder/kmimetypefinder.cpp
+++ b/kmimetypefinder/kmimetypefinder.cpp
@@ -18,10 +18,10 @@
  */
 
 #include <QFile>
+#include <QCoreApplication>
 
 #include <kmimetype.h>
 #include <kcmdlineargs.h>
-#include <QCoreApplication>
 #include <kdeversion.h>
 #include <klocale.h>
 #include <kcomponentdata.h>