diff --git a/tdecore/tdeconfig_compiler/CMakeLists.txt b/tdecore/tdeconfig_compiler/CMakeLists.txt
index 3da974a53..ec2eac9e7 100644
--- a/tdecore/tdeconfig_compiler/CMakeLists.txt
+++ b/tdecore/tdeconfig_compiler/CMakeLists.txt
@@ -9,6 +9,8 @@
 #
 #################################################
 
+add_subdirectory(tests)
+
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/tdecore
diff --git a/tdecore/tdeconfig_compiler/tests/test1.kcfg b/tdecore/tdeconfig_compiler/tests/test1.kcfg
index ce42aebfb..e2bbed175 100644
--- a/tdecore/tdeconfig_compiler/tests/test1.kcfg
+++ b/tdecore/tdeconfig_compiler/tests/test1.kcfg
@@ -3,7 +3,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 
                           http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-  <include>qdir.h</include>
+  <include>tqdir.h</include>
   <kcfgfile name="examplerc">
     <parameter name="transport" />
     <parameter name="folder" />
@@ -35,7 +35,7 @@
     </entry>
     <entry name="MyPath" type="Path">
       <label>This is a path</label>
-      <default code="true">QDir::homeDirPath()+QString::fromLatin1(".hidden_file")</default>
+      <default code="true">TQDir::homeDirPath()+TQString::fromLatin1(".hidden_file")</default>
     </entry>
     <entry name="AnotherOption2" type="Int" key="Another Option">
       <label>Another option</label>
diff --git a/tdecore/tdeconfig_compiler/tests/test4.cpp.ref b/tdecore/tdeconfig_compiler/tests/test4.cpp.ref
index c68437969..d25447c3c 100644
--- a/tdecore/tdeconfig_compiler/tests/test4.cpp.ref
+++ b/tdecore/tdeconfig_compiler/tests/test4.cpp.ref
@@ -26,7 +26,7 @@ Test4::Test4(  )
   mSelf = this;
   setCurrentGroup( TQString::fromLatin1( "Foo" ) );
 
-TQColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black };
+TQColor defaultColor[4] = { TQt::red, TQt::blue, TQt::green, TQt::black };
   TDEConfigSkeleton::ItemColor  *itemColor[4];
   itemColor[0] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #0" ), mColor[0], defaultColor[0] );
   addItem( itemColor[0], TQString::fromLatin1( "Color0" ) );
diff --git a/tdecore/tdeconfig_compiler/tests/test4.kcfg b/tdecore/tdeconfig_compiler/tests/test4.kcfg
index d8ef2bfae..ef649e4c4 100644
--- a/tdecore/tdeconfig_compiler/tests/test4.kcfg
+++ b/tdecore/tdeconfig_compiler/tests/test4.kcfg
@@ -9,7 +9,7 @@
     <entry name="Color$(Number)" type="Color" key="color #$(Number)">
       <parameter name="Number" type="Int" max="3"/>
       <label>Block colors.</label>
-      <code>QColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black };</code>
+      <code>TQColor defaultColor[4] = { TQt::red, TQt::blue, TQt::green, TQt::black };</code>
       <default code="true">defaultColor[$(Number)]</default>
     </entry>
     <entry name="MouseAction$(Button)" type="Enum" key="$(Button)_mouse_action">
diff --git a/tdecore/tdeconfig_compiler/tests/test5.cpp.ref b/tdecore/tdeconfig_compiler/tests/test5.cpp.ref
index 17965999b..8a359ecd1 100644
--- a/tdecore/tdeconfig_compiler/tests/test5.cpp.ref
+++ b/tdecore/tdeconfig_compiler/tests/test5.cpp.ref
@@ -26,7 +26,7 @@ Test5::Test5(  )
   mSelf = this;
   setCurrentGroup( TQString::fromLatin1( "Foo" ) );
 
-TQColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black };
+TQColor defaultColor[4] = { TQt::red, TQt::blue, TQt::green, TQt::black };
   TDEConfigSkeleton::ItemColor  *itemColor[4];
   itemColor[0] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #0" ), mColor[0], defaultColor[0] );
   addItem( itemColor[0], TQString::fromLatin1( "Color0" ) );
diff --git a/tdecore/tdeconfig_compiler/tests/test5.kcfg b/tdecore/tdeconfig_compiler/tests/test5.kcfg
index d8ef2bfae..ef649e4c4 100644
--- a/tdecore/tdeconfig_compiler/tests/test5.kcfg
+++ b/tdecore/tdeconfig_compiler/tests/test5.kcfg
@@ -9,7 +9,7 @@
     <entry name="Color$(Number)" type="Color" key="color #$(Number)">
       <parameter name="Number" type="Int" max="3"/>
       <label>Block colors.</label>
-      <code>QColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black };</code>
+      <code>TQColor defaultColor[4] = { TQt::red, TQt::blue, TQt::green, TQt::black };</code>
       <default code="true">defaultColor[$(Number)]</default>
     </entry>
     <entry name="MouseAction$(Button)" type="Enum" key="$(Button)_mouse_action">
diff --git a/tdecore/tdeconfig_compiler/tests/test9.kcfg b/tdecore/tdeconfig_compiler/tests/test9.kcfg
index b7495e2b6..2c4f1ffa8 100644
--- a/tdecore/tdeconfig_compiler/tests/test9.kcfg
+++ b/tdecore/tdeconfig_compiler/tests/test9.kcfg
@@ -3,7 +3,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 
                           http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-  <include>qdir.h</include>
+  <include>tqdir.h</include>
   <kcfgfile name="examplerc">
     <parameter name="transport" />
     <parameter name="folder" />
@@ -18,7 +18,7 @@
     </entry>
     <entry name="MyPathsList2" type="PathList">
       <label>This is an additional test for PathList</label>
-      <default code="true">QStringList(QString::fromLatin1("/usr/bin")) += QDir::homeDirPath()</default>
+      <default code="true">TQStringList(TQString::fromLatin1("/usr/bin")) += TQDir::homeDirPath()</default>
     </entry>
   </group>
 </kcfg>