diff --git a/kabc/tests/CMakeLists.txt b/kabc/tests/CMakeLists.txt
index b5689b14f..3bf6e3303 100644
--- a/kabc/tests/CMakeLists.txt
+++ b/kabc/tests/CMakeLists.txt
@@ -1,281 +1,293 @@
 kde4_header()
 
 include_directories( ${CMAKE_SOURCE_DIR}/kabc ${CMAKE_SOURCE_DIR}/kab ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}  )
 
 
 ########### next target ###############
 
 set(testlock_SRCS
 testlock.cpp
 )
 
 kde4_automoc(${testlock_SRCS})
 
 if(KDE4_BUILD_TESTS)
 kde4_add_executable(testlock ${testlock_SRCS})
 
-target_link_libraries(testlock  ${QT_AND_KDECORE_LIBS} )
+target_link_libraries(testlock  ${QT_AND_KDECORE_LIBS} kabc QtTest)
 
 endif(KDE4_BUILD_TESTS)
 
 ########### next target ###############
 
 set(testldapclient_SRCS
 testldapclient.cpp
 )
 
 kde4_automoc(${testldapclient_SRCS})
 
 if(KDE4_BUILD_TESTS)
 kde4_add_executable(testldapclient ${testldapclient_SRCS})
 
-target_link_libraries(testldapclient  ${QT_AND_KDECORE_LIBS} )
+target_link_libraries(testldapclient  ${QT_AND_KDECORE_LIBS} kabc QtTest)
 
 endif(KDE4_BUILD_TESTS)
 
 ########### next target ###############
 
 set(geotest_SRCS
 geotest.cpp
 )
 
 kde4_automoc(${geotest_SRCS})
 
 if(KDE4_BUILD_TESTS)
 kde4_add_executable(geotest ${geotest_SRCS})
 
-target_link_libraries(geotest  ${QT_AND_KDECORE_LIBS} )
+target_link_libraries(geotest  ${QT_AND_KDECORE_LIBS} kabc QtTest)
 
 endif(KDE4_BUILD_TESTS)
 
 ########### next target ###############
 
 set(testkabc_SRCS
 testkabc.cpp
 )
 
 kde4_automoc(${testkabc_SRCS})
 
 if(KDE4_BUILD_TESTS)
 kde4_add_executable(testkabc ${testkabc_SRCS})
 
-target_link_libraries(testkabc  ${QT_AND_KDECORE_LIBS} )
+target_link_libraries(testkabc  ${QT_AND_KDECORE_LIBS} kabc QtTest)
 
 endif(KDE4_BUILD_TESTS)
 
 ########### next target ###############
 
 set(testkabcdlg_SRCS
 testkabcdlg.cpp
 )
 
 kde4_automoc(${testkabcdlg_SRCS})
 
 if(KDE4_BUILD_TESTS)
 kde4_add_executable(testkabcdlg ${testkabcdlg_SRCS})
 
-target_link_libraries(testkabcdlg  ${QT_AND_KDECORE_LIBS} )
+target_link_libraries(testkabcdlg  ${QT_AND_KDECORE_LIBS} kabc QtTest)
 
 endif(KDE4_BUILD_TESTS)
 
 ########### next target ###############
 
 set(testdistlist_SRCS
 testdistlist.cpp
 )
 
 kde4_automoc(${testdistlist_SRCS})
 
 if(KDE4_BUILD_TESTS)
 kde4_add_executable(testdistlist ${testdistlist_SRCS})
 
-target_link_libraries(testdistlist  ${QT_AND_KDECORE_LIBS} )
+target_link_libraries(testdistlist  ${QT_AND_KDECORE_LIBS} kabc QtTest)
 
 endif(KDE4_BUILD_TESTS)
 
 ########### next target ###############
 
 set(bigread_SRCS
 bigread.cpp
 )
 
 kde4_automoc(${bigread_SRCS})
 
 if(KDE4_BUILD_TESTS)
-kde4_add_executable(bigread ${bigread_SRCS})
 
-target_link_libraries(bigread  ${QT_AND_KDECORE_LIBS} kabc kabc_file )
+message(STATUS "skipping kabc/tests bigread, how to link to a plugin (kabc_file.so) ?")
+#kde4_add_executable(bigread ${bigread_SRCS})
+#
+#target_link_libraries(bigread  ${QT_AND_KDECORE_LIBS} kabc kabc_file )
 
 endif(KDE4_BUILD_TESTS)
 
 ########### next target ###############
 
 set(bigwrite_SRCS
 bigwrite.cpp
 )
 
 kde4_automoc(${bigwrite_SRCS})
 
 if(KDE4_BUILD_TESTS)
-kde4_add_executable(bigwrite ${bigwrite_SRCS})
 
-target_link_libraries(bigwrite  ${QT_AND_KDECORE_LIBS} kabc kabc_file )
+message(STATUS "skipping kabc/tests bigwrite, how to link to a plugin (kabc_file.so) ?")
+
+#kde4_add_executable(bigwrite ${bigwrite_SRCS})
+#
+#target_link_libraries(bigwrite  ${QT_AND_KDECORE_LIBS} kabc kabc_file )
 
 endif(KDE4_BUILD_TESTS)
 
 ########### next target ###############
 
 set(testdb_SRCS
 testdb.cpp
 )
 
 kde4_automoc(${testdb_SRCS})
 
 if(KDE4_BUILD_TESTS)
-kde4_add_executable(testdb ${testdb_SRCS})
 
-target_link_libraries(testdb  ${QT_AND_KDECORE_LIBS} )
+message(STATUS "skipping kabc/tests testdb, mysql check missing")
+
+#kde4_add_executable(testdb ${testdb_SRCS})
+#
+#target_link_libraries(testdb  ${QT_AND_KDECORE_LIBS} kabc QtTest)
 
 endif(KDE4_BUILD_TESTS)
 
 ########### next target ###############
 
 set(testaddressee_SRCS
 testaddressee.cpp
 )
 
 kde4_automoc(${testaddressee_SRCS})
 
 if(KDE4_BUILD_TESTS)
+
 kde4_add_executable(testaddressee ${testaddressee_SRCS})
 
-target_link_libraries(testaddressee  ${QT_AND_KDECORE_LIBS} )
+target_link_libraries(testaddressee  ${QT_AND_KDECORE_LIBS} kabc QtTest)
 
 endif(KDE4_BUILD_TESTS)
 
 ########### next target ###############
 
 set(testaddresseelist_SRCS
 testaddresseelist.cpp
 )
 
 kde4_automoc(${testaddresseelist_SRCS})
 
 if(KDE4_BUILD_TESTS)
-kde4_add_executable(testaddresseelist ${testaddresseelist_SRCS})
 
-target_link_libraries(testaddresseelist  ${QT_AND_KDECORE_LIBS} )
+message(STATUS "skipping kabc/tests testaddresseelist")
+
+#kde4_add_executable(testaddresseelist ${testaddresseelist_SRCS})
+#
+#target_link_libraries(testaddresseelist  ${QT_AND_KDECORE_LIBS} kabc QtTest)
 
 endif(KDE4_BUILD_TESTS)
 
 ########### next target ###############
 
 set(testaddressfmt_SRCS
 testaddressfmt.cpp
 )
 
 kde4_automoc(${testaddressfmt_SRCS})
 
 if(KDE4_BUILD_TESTS)
 kde4_add_executable(testaddressfmt ${testaddressfmt_SRCS})
 
-target_link_libraries(testaddressfmt  ${QT_AND_KDECORE_LIBS} )
+target_link_libraries(testaddressfmt  ${QT_AND_KDECORE_LIBS} kabc QtTest)
 
 endif(KDE4_BUILD_TESTS)
 
 ########### next target ###############
 
 set(kabcargl_SRCS
 kabcargl.cpp
 )
 
 kde4_automoc(${kabcargl_SRCS})
 
 if(KDE4_BUILD_TESTS)
 kde4_add_executable(kabcargl ${kabcargl_SRCS})
 
-target_link_libraries(kabcargl  ${QT_AND_KDECORE_LIBS} )
+target_link_libraries(kabcargl  ${QT_AND_KDECORE_LIBS} kabc QtTest)
 
 endif(KDE4_BUILD_TESTS)
 
 ########### next target ###############
 
 set(testaddresslineedit_SRCS
 testaddresslineedit.cpp
 )
 
 kde4_automoc(${testaddresslineedit_SRCS})
 
 if(KDE4_BUILD_TESTS)
 kde4_add_executable(testaddresslineedit ${testaddresslineedit_SRCS})
 
-target_link_libraries(testaddresslineedit  ${QT_AND_KDECORE_LIBS} )
+target_link_libraries(testaddresslineedit  ${QT_AND_KDECORE_LIBS} kabc QtTest)
 
 endif(KDE4_BUILD_TESTS)
 
 ########### install files ###############
 
 
 kde4_footer()
 
 
 
 #original Makefile.am contents follow:
 
 ## Make sure $(all_includes) remains last!
 #INCLUDES = -I$(top_builddir)/kabc -I$(top_srcdir)/kabc -I$(top_srcdir)/kab \
 #           -I$(srcdir)/../vcardparser/ -I$(srcdir)/../vcard/include \
 #           -I$(srcdir)/../vcard/include/generated \
 #           -I$(srcdir)/../vcardparser $(all_includes)
 #LDADD = ../libkabc.la -lQtTest_debug
 #
 #METASOURCES = AUTO
 #
 #check_PROGRAMS = testlock testldapclient geotest
 #
 #geotest_SOURCES = geotest.cpp
 #
 #testlock_LDFLAGS = $(all_libraries)
 #testlock_SOURCES = testlock.cpp
 #
 #testldapclient_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 #testldapclient_SOURCES = testldapclient.cpp
 #
 #EXTRA_PROGRAMS = testkabc testkabcdlg testdistlist bigread bigwrite testdb \
 #  testaddressee testaddresseelist testaddressfmt kabcargl testaddresslineedit
 #
 #testkabc_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 #testkabc_SOURCES = testkabc.cpp
 #
 #testaddressee_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 #testaddressee_SOURCES = testaddressee.cpp
 #
 #testaddresseelist_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 #testaddresseelist_SOURCES = testaddresseelist.cpp
 #
 #testaddressfmt_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 #testaddressfmt_SOURCES = testaddressfmt.cpp
 #
 #testkabcdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 #testkabcdlg_SOURCES = testkabcdlg.cpp
 #
 #testdistlist_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 #testdistlist_SOURCES = testdistlist.cpp
 #
 #testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 #testaddresslineedit_SOURCES = testaddresslineedit.cpp
 #
 #bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 #bigread_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la
 #bigread_SOURCES = bigread.cpp
 #
 #bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 #bigwrite_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la
 #bigwrite_SOURCES = bigwrite.cpp
 #
 #testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 #testdb_SOURCES = testdb.cpp
 #
 #kabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 #kabcargl_SOURCES = kabcargl.cpp
 #
diff --git a/kabc/tests/bigread.cpp b/kabc/tests/bigread.cpp
index e64bafef8..48c9ea708 100644
--- a/kabc/tests/bigread.cpp
+++ b/kabc/tests/bigread.cpp
@@ -1,65 +1,65 @@
 #include <sys/times.h>
 
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kcmdlineargs.h>
 
 #include "addressbook.h"
 #include "vcardformat.h"
 #include "plugins/file/resourcefile.h"
 #if 0
 #include "resourcesql.h"
 #endif
 
 using namespace KABC;
 
 int main(int argc,char **argv)
 {
   KAboutData aboutData("bigread","BigReadKabc","0.1");
   KCmdLineArgs::init(argc,argv,&aboutData);
 
-  KApplication app( false, false );
+  KApplication app( false);
   
   AddressBook ab; 
    
   ResourceFile r( "my.kabc", "vcard2" );
   ab.addResource( &r );
 
 #if 0  
   ResourceSql rsql( &ab, "root", "kde4ever", "localhost" );
   ab.addResource( &rsql );
 #endif
 
   struct tms start;
 
   times( &start );
 
 #if 0
   kdDebug() << "utime : " << int( start.tms_utime ) << endl;
   kdDebug() << "stime : " << int( start.tms_stime ) << endl;
   kdDebug() << "cutime: " << int( start.tms_cutime ) << endl;
   kdDebug() << "cstime: " << int( start.tms_cstime ) << endl;
 #endif
 	    
   kdDebug() << "Start load" << endl;
   ab.load();
   kdDebug() << "Finished load" << endl;
 
   struct tms end;
 
   times( &end );
 
 #if 0
   kdDebug() << "utime : " << int( end.tms_utime ) << endl;
   kdDebug() << "stime : " << int( end.tms_stime ) << endl;
   kdDebug() << "cutime: " << int( end.tms_cutime ) << endl;
   kdDebug() << "cstime: " << int( end.tms_cstime ) << endl;
 #endif
 
   kdDebug() << "UTime: " << int( end.tms_utime ) - int( start.tms_utime ) << endl; 
   kdDebug() << "STime: " << int( end.tms_stime ) - int( start.tms_stime ) << endl; 
 
 //  ab.dump();
 }
diff --git a/kabc/tests/bigwrite.cpp b/kabc/tests/bigwrite.cpp
index 90013a157..aa8969471 100644
--- a/kabc/tests/bigwrite.cpp
+++ b/kabc/tests/bigwrite.cpp
@@ -1,70 +1,70 @@
 #include <sys/times.h>
 
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kcmdlineargs.h>
 
 #include "addressbook.h"
 #include "vcardformat.h"
 #include "plugins/file/resourcefile.h"
 
 using namespace KABC;
 
 int main(int argc,char **argv)
 {
   KAboutData aboutData("bigwrite","BigWriteKabc","0.1");
   KCmdLineArgs::init(argc,argv,&aboutData);
 
-  KApplication app( false, false );
+  KApplication app( false );
 
   AddressBook ab;
   ResourceFile r( "my.kabc", "vcard" );
   ab.addResource( &r );
   
   for( int i = 0; i < 5000; ++i ) {
     Addressee a;
     a.setGivenName( "number" + QString::number( i ) );
     a.setFamilyName( "Name" );
     a.insertEmail( QString::number( i ) + "@domain" );
     
     ab.insertAddressee( a );
   }
   printf( "\n" );
   
   Ticket *t = ab.requestSaveTicket( &r );
   if ( t ) {
     struct tms start;
 
     times( &start );
 
 #if 0
     kdDebug() << "utime : " << int( start.tms_utime ) << endl;
     kdDebug() << "stime : " << int( start.tms_stime ) << endl;
     kdDebug() << "cutime: " << int( start.tms_cutime ) << endl;
     kdDebug() << "cstime: " << int( start.tms_cstime ) << endl;
 #endif
 	    
     if ( !ab.save( t ) ) {
       kdDebug() << "Can't save." << endl;
     }
 
     struct tms end;
 
     times( &end );
 
 #if 0
     kdDebug() << "utime : " << int( end.tms_utime ) << endl;
     kdDebug() << "stime : " << int( end.tms_stime ) << endl;
     kdDebug() << "cutime: " << int( end.tms_cutime ) << endl;
     kdDebug() << "cstime: " << int( end.tms_cstime ) << endl;
 #endif
 
     kdDebug() << "UTime: " << int( end.tms_utime ) - int( start.tms_utime ) << endl; 
     kdDebug() << "STime: " << int( end.tms_stime ) - int( start.tms_stime ) << endl; 
 
   } else {
     kdDebug() << "No ticket for save." << endl;
   }
 }
diff --git a/kresources/CMakeLists.txt b/kresources/CMakeLists.txt
index e18e7ebdf..44deaa745 100644
--- a/kresources/CMakeLists.txt
+++ b/kresources/CMakeLists.txt
@@ -1,131 +1,131 @@
 kde4_header()
 
 include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}  )
 
 
 ########### next target ###############
 
 set(kresources_LIB_SRCS
 resource.cpp
 factory.cpp
 managerimpl.cpp
 configwidget.cpp
 configdialog.cpp
 selectdialog.cpp
 configpage.cpp
 )
 
 kde4_automoc(${kresources_LIB_SRCS})
 
 set( kresources_DCOP_SKEL_SRCS
 manageriface.h
 )
 
 kde4_add_dcop_skels(kresources_LIB_SRCS ${kresources_DCOP_SKEL_SRCS})
 
 set( kresources_DCOP_STUB_SRCS
 manageriface.h
 )
 
 kde4_add_dcop_stubs(kresources_LIB_SRCS ${kresources_DCOP_STUB_SRCS})
 
 kde4_add_library(kresources SHARED ${kresources_LIB_SRCS})
 
 target_link_libraries(kresources  ${QT_AND_KDECORE_LIBS} kdeui kio )
 
 set_target_properties(kresources PROPERTIES VERSION 1.2.0 SOVERSION 1 )
 install_targets(/lib kresources )
 
 
 ########### next target ###############
 
 set(kcm_kresources_PART_SRCS
 kcmkresources.cpp
 )
 
 kde4_automoc(${kcm_kresources_PART_SRCS})
 
 kde4_add_plugin(kcm_kresources ${kcm_kresources_PART_SRCS})
 
 target_link_libraries(kcm_kresources  ${QT_AND_KDECORE_LIBS} kresources )
 
 install_targets(/lib/kde4 kcm_kresources )
 
 
 ########### next target ###############
 
 set(testresources_SRCS
 testresources.cpp
 )
 
 kde4_automoc(${testresources_SRCS})
 
 if(KDE4_BUILD_TESTS)
 kde4_add_executable(testresources ${testresources_SRCS})
 
-target_link_libraries(testresources  ${QT_AND_KDECORE_LIBS} )
+target_link_libraries(testresources  ${QT_AND_KDECORE_LIBS} kresources)
 
 endif(KDE4_BUILD_TESTS)
 
 ########### install files ###############
 
 install_files( ${XDG_APPS_DIR} FILES kresources.desktop )
 install_files( ${KDE4_SERVICESTYPES_DIR} FILES kresources_plugin.desktop kresources_manager.desktop )
 
 kde4_create_doxygen_docs(  )
 
 kde4_footer()
 
 
 
 #original Makefile.am contents follow:
 
 #INCLUDES = $(all_includes)
 #
 #METASOURCES = AUTO
 #
 #lib_LTLIBRARIES = libkresources.la
 #
 #libkresources_la_SOURCES = resource.cpp \
 #  factory.cpp \
 #  manageriface.skel \
 #  manageriface.stub \
 #  managerimpl.cpp \
 #  configwidget.cpp \
 #  configdialog.cpp \
 #  selectdialog.cpp \
 #  configpage.cpp
 #
 #libkresources_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
 #libkresources_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
 #
 #kresincludedir = $(includedir)/kresources
 #kresinclude_HEADERS = resource.h \
 #  configwidget.h \
 #  factory.h \
 #  manageriface.h \
 #  managerimpl.h \
 #  manager.h \
 #  selectdialog.h \
 #  configdialog.h \
 #  configpage.h
 #
 #kde_module_LTLIBRARIES = kcm_kresources.la
 #
 #kcm_kresources_la_SOURCES = kcmkresources.cpp
 #kcm_kresources_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 #kcm_kresources_la_LIBADD = libkresources.la
 #
 #
 #check_PROGRAMS = testresources
 #
 #testresources_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 #testresources_LDADD   = libkresources.la
 #testresources_SOURCES = testresources.cpp
 #
 #xdg_apps_DATA = kresources.desktop
 #
 #servicetypedir = $(kde_servicetypesdir)
 #servicetype_DATA = kresources_plugin.desktop kresources_manager.desktop
 #
 #include ../admin/Doxyfile.am