diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 29125f87..76e3bef1 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -52,6 +52,5 @@ endif( )
 
 
 # required stuff
-find_package( Qt )
 find_package( TQt )
 find_package( TDE )
diff --git a/kdevdesigner/designer/CMakeLists.txt b/kdevdesigner/designer/CMakeLists.txt
index dfd7f914..c88e9c32 100644
--- a/kdevdesigner/designer/CMakeLists.txt
+++ b/kdevdesigner/designer/CMakeLists.txt
@@ -96,7 +96,7 @@ tde_moc( SRCS
  )
 
 
-tde_add_kpart( libkdevdesignerpart AUTOMOC
+tde_add_kpart( libkdevdesignerpart
   SOURCES ${SRCS}
   LINK
     kdevqui-static shared-static kinterfacedesigner-static
diff --git a/lib/interfaces/extensions/CMakeLists.txt b/lib/interfaces/extensions/CMakeLists.txt
index d7c9cbf1..238e6a2e 100644
--- a/lib/interfaces/extensions/CMakeLists.txt
+++ b/lib/interfaces/extensions/CMakeLists.txt
@@ -39,12 +39,12 @@ install( FILES
 
 add_custom_command( OUTPUT codebrowserfrontend.moc.cpp
   COMMAND
-    ${TQT_TMOC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/codebrowserfrontend.h -o codebrowserfrontend.moc.cpp
+    ${TMOC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/codebrowserfrontend.h -o codebrowserfrontend.moc.cpp
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/codebrowserfrontend.h )
 
 add_custom_command( OUTPUT kdevversioncontrol.moc.cpp
   COMMAND
-    ${TQT_TMOC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/kdevversioncontrol.h -o kdevversioncontrol.moc.cpp
+    ${TMOC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/kdevversioncontrol.h -o kdevversioncontrol.moc.cpp
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/kdevversioncontrol.h )
 
 tde_add_library( kdevextensions STATIC_PIC AUTOMOC
diff --git a/vcs/CMakeLists.txt b/vcs/CMakeLists.txt
index 8ec61b98..c2112360 100644
--- a/vcs/CMakeLists.txt
+++ b/vcs/CMakeLists.txt
@@ -10,6 +10,6 @@
 #################################################
 
 tde_conditional_add_subdirectory( WITH_VCS_CLEARCASE clearcase )
-tde_conditional_add_subdirectory( WITH_VCS_CVSSERVICE cvsservice )
+#tde_conditional_add_subdirectory( WITH_VCS_CVSSERVICE cvsservice )
 tde_conditional_add_subdirectory( WITH_VCS_PERFORCE perforce )
 tde_conditional_add_subdirectory( WITH_VCS_SUBVERSION subversion )
diff --git a/vcs/cvsservice/CMakeLists.txt b/vcs/cvsservice/CMakeLists.txt
index a924f251..c6e0a0b8 100644
--- a/vcs/cvsservice/CMakeLists.txt
+++ b/vcs/cvsservice/CMakeLists.txt
@@ -9,7 +9,7 @@
 #
 #################################################
 
-tde_message_fatal( "csvservice is not done yet" )
+# tde_message_fatal( "csvservice is not done yet" )
 
 add_subdirectory( integrator )