diff --git a/CMakeLists.txt b/CMakeLists.txt
index bfa327c..3826725 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,13 +5,10 @@ add_subdirectory(generator)
 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules )
 
-# search packages used by KDE
-find_package(KDE4 REQUIRED)
-include(KDE4Defaults)
-include(MacroLibrary)
+find_package(Qt4 REQUIRED)
 
 # the MACRO_OPTIONAL_DEPEND_PACKAGE from KDE4 is broken
-macro (OUR_MACRO_OPTIONAL_DEPEND_PACKAGE _name _module_needed)
+MACRO (OUR_MACRO_OPTIONAL_DEPEND_PACKAGE _name _module_needed)
    set(_packagename Find${_name}.cmake)
    find_file(${_name}_PACKAGE_DEPEND_FOUND ${_packagename} PATHS ${CMAKE_MODULE_PATH} )
    if(NOT ${_name}_PACKAGE_DEPEND_FOUND)
@@ -20,47 +17,12 @@ macro (OUR_MACRO_OPTIONAL_DEPEND_PACKAGE _name _module_needed)
    else(NOT ${_name}_PACKAGE_DEPEND_FOUND)
         set(DEPEND_PACKAGE_${_name} TRUE)
    endif(NOT ${_name}_PACKAGE_DEPEND_FOUND)
-endmacro (OUR_MACRO_OPTIONAL_DEPEND_PACKAGE)
+ENDMACRO (OUR_MACRO_OPTIONAL_DEPEND_PACKAGE)
 
 
-add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT3_SUPPORT)
-include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
+add_definitions (${QT_DEFINITIONS} -DQT3_SUPPORT)
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
 
-macro_optional_find_package(OpenGL)
-set(SOPRANO_MIN_VERSION "2.0")
-macro_optional_find_package(Soprano)
-macro_optional_find_package(Nepomuk)
-macro_optional_find_package(KdepimLibs)
-macro_optional_find_package(Phonon)
-macro_optional_find_package(QScintilla)
+#macro_optional_find_package(OpenGL)
 
-# Look for Okular
-set( OKULAR_FOUND "no" )
-our_macro_optional_depend_package(Okular "Okular")
-if(DEPEND_PACKAGE_Okular)
-  macro_optional_find_package(Okular)
-endif(DEPEND_PACKAGE_Okular)
-
-# Look for Akonadi
-our_macro_optional_depend_package(Akonadi "Akonadi")
-if(DEPEND_PACKAGE_Akonadi)
-  macro_optional_find_package(Akonadi)
-endif(DEPEND_PACKAGE_Akonadi)
-
-# Look for KDevelop
-set( KDEVPLATFORM_FOUND "no" )
-option(WITH_KDevPlatform "Search for KDevPlatform package" OFF)
-our_macro_optional_depend_package(KDevPlatform "KDevPlatform")
-if(DEPEND_PACKAGE_KDevPlatform)
-  macro_optional_find_package(KDevPlatform)
-endif(DEPEND_PACKAGE_KDevPlatform)
-
-macro_optional_add_subdirectory(smoke)
-macro_optional_add_subdirectory(ruby)
-macro_optional_add_subdirectory(python)
-macro_optional_add_subdirectory(csharp)
-macro_optional_add_subdirectory(java)
-macro_optional_add_subdirectory(php)
-macro_optional_add_subdirectory(falcon)
-
-macro_display_feature_log()
+add_subdirectory(smoke)
diff --git a/smoke/CMakeLists.txt b/smoke/CMakeLists.txt
index a335d83..055e038 100644
--- a/smoke/CMakeLists.txt
+++ b/smoke/CMakeLists.txt
@@ -6,16 +6,6 @@ OPTION(ENABLE_QTWEBKIT_SMOKE "build QtWebKitSmoke" ON)
 OPTION(ENABLE_QTSCRIPT_SMOKE "build QtScriptSmoke" ON)
 OPTION(ENABLE_QTUITOOLS_SMOKE "build QtUiToolsSmoke" ON)
 OPTION(ENABLE_QTTEST_SMOKE "build QtTestSmoke" ON)
-OPTION(ENABLE_PHONON_SMOKE "build PhononSmoke" OFF)
-OPTION(ENABLE_QSCI_SMOKE "build QsciSmoke" ON)
-OPTION(ENABLE_QWT_SMOKE "build QwtSmoke" OFF)
-OPTION(ENABLE_QIMAGEBLITZ_SMOKE "build QImageBlitzSmoke" ON)
-OPTION(ENABLE_KDE_SMOKE "build KDESmoke" ON)
-OPTION(ENABLE_KDEVPLATFORM_SMOKE "build KDevPlatformSmoke" OFF)
-OPTION(ENABLE_KHTML_SMOKE "build KHTMLSmoke" ON)
-OPTION(ENABLE_KTEXTEDITOR_SMOKE "build KTextEditorSmoke" ON)
-OPTION(ENABLE_SOLID_SMOKE "build SolidSmoke" ON)
-OPTION(ENABLE_PLASMA_SMOKE "build PlasmaSmoke" ON)
 
 set(SMOKE_ENABLED "no")
 if(ENABLE_SMOKE)
@@ -58,76 +48,6 @@ if(ENABLE_SMOKE)
         set(SMOKE_ENABLED "${SMOKE_ENABLED}, QtTest")
     endif(ENABLE_QTTEST_SMOKE)
 
-    if(ENABLE_PHONON_SMOKE AND PHONON_FOUND)
-        add_subdirectory(phonon)
-        set(SMOKE_ENABLED "${SMOKE_ENABLED}, Phonon")
-    endif(ENABLE_PHONON_SMOKE AND PHONON_FOUND)
-
-    if(ENABLE_QSCI_SMOKE AND QSCINTILLA_FOUND)
-        add_subdirectory(qsci)
-        set(SMOKE_ENABLED "${SMOKE_ENABLED}, QScintilla2")
-    endif(ENABLE_QSCI_SMOKE AND QSCINTILLA_FOUND)
-
-    if(ENABLE_QWT_SMOKE)
-        add_subdirectory(qwt)
-        set(SMOKE_ENABLED "${SMOKE_ENABLED}, Qwt")
-    endif(ENABLE_QWT_SMOKE)
-
-    if(ENABLE_QIMAGEBLITZ_SMOKE)
-        add_subdirectory(qimageblitz)
-        set(SMOKE_ENABLED "${SMOKE_ENABLED}, QImageBlitz")
-    endif(ENABLE_QIMAGEBLITZ_SMOKE)
-
-    if(ENABLE_SOLID_SMOKE)
-        add_subdirectory(solid)
-        set(SMOKE_ENABLED "${SMOKE_ENABLED}, Solid")
-    endif(ENABLE_SOLID_SMOKE)
-
-    if(Soprano_FOUND)
-        add_subdirectory(soprano)
-        set(SMOKE_ENABLED "${SMOKE_ENABLED}, Soprano")
-    endif(Soprano_FOUND)
-
-    if(ENABLE_PLASMA_SMOKE)
-      add_subdirectory(plasma)
-      set(SMOKE_ENABLED "${SMOKE_ENABLED}, Plasma")
-    endif(ENABLE_PLASMA_SMOKE)
-
-    if(ENABLE_KDE_SMOKE)
-        add_subdirectory(kde)
-        set(SMOKE_ENABLED "${SMOKE_ENABLED}, KDE")
-    endif(ENABLE_KDE_SMOKE)
-
-    if(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
-        add_subdirectory(akonadi)
-        set(SMOKE_ENABLED "${SMOKE_ENABLED}, Akonadi")
-    endif(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
-
-    if(ENABLE_KDEVPLATFORM_SMOKE)
-        add_subdirectory(kdevplatform)
-        set(SMOKE_ENABLED "${SMOKE_ENABLED}, KDevPlatform")
-    endif(ENABLE_KDEVPLATFORM_SMOKE)
-
-    if(ENABLE_KHTML_SMOKE)
-        add_subdirectory(khtml)
-        set(SMOKE_ENABLED "${SMOKE_ENABLED}, KHTML")
-    endif(ENABLE_KHTML_SMOKE)
-
-    if(ENABLE_KTEXTEDITOR_SMOKE)
-        add_subdirectory(ktexteditor)
-        set(SMOKE_ENABLED "${SMOKE_ENABLED}, KTextEditor")
-    endif(ENABLE_KTEXTEDITOR_SMOKE)
-
-    if(Nepomuk_FOUND)
-        add_subdirectory(nepomuk)
-        set(SMOKE_ENABLED "${SMOKE_ENABLED}, Nepomuk")
-    endif(Nepomuk_FOUND)
-
-    if(OKULAR_FOUND)
-        add_subdirectory(okular)
-        set(SMOKE_ENABLED "${SMOKE_ENABLED}, Okular")
-    endif(OKULAR_FOUND)
-
 endif(ENABLE_SMOKE)
 
 # for qtguess.pl