diff --git a/dcoprss/Makefile.am b/dcoprss/Makefile.am
index 86660056..ac4080e5 100644
--- a/dcoprss/Makefile.am
+++ b/dcoprss/Makefile.am
@@ -1,18 +1,18 @@
 bin_PROGRAMS = rssservice rssclient feedbrowser
 INCLUDES = -I$(top_srcdir) $(all_includes)
 
-rssservice_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
-rssservice_LDADD = $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) ../librss/librss.la
+rssservice_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
+rssservice_LDADD = $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) ../librss/librss.la
 rssservice_SOURCES = main.cpp service.cpp query.cpp document.cpp article.cpp query.skel service.skel xmlrpciface.cpp cache.cpp
 
 
 # client stuff
-rssclient_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
-rssclient_LDADD   = $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
+rssclient_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
+rssclient_LDADD   = $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
 rssclient_SOURCES = client.cpp
 
-feedbrowser_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
-feedbrowser_LDADD = $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
+feedbrowser_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
+feedbrowser_LDADD = $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
 feedbrowser_SOURCES = feedbrowser.skel feedbrowser.cpp
 
 noinst_HEADERS = service.h query.h xmlrpciface.h cache.h
diff --git a/filesharing/advanced/kcm_sambaconf/Makefile.am b/filesharing/advanced/kcm_sambaconf/Makefile.am
index a45eab9d..21c0d036 100644
--- a/filesharing/advanced/kcm_sambaconf/Makefile.am
+++ b/filesharing/advanced/kcm_sambaconf/Makefile.am
@@ -18,7 +18,7 @@ kcm_kcmsambaconf_la_LIBADD = \
       -ltdeprint \
       libfilesharesamba.la
       
-kcm_kcmsambaconf_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)  $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kcmsambaconf_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)  $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 libfilesharesamba_la_SOURCES = \
     sambafile.cpp \
diff --git a/filesharing/advanced/propsdlgplugin/Makefile.am b/filesharing/advanced/propsdlgplugin/Makefile.am
index 817e8748..41e43fb7 100644
--- a/filesharing/advanced/propsdlgplugin/Makefile.am
+++ b/filesharing/advanced/propsdlgplugin/Makefile.am
@@ -17,7 +17,7 @@ fileshare_propsdlgplugin_la_LIBADD = \
     ../kcm_sambaconf/libfilesharesamba.la \
 	$(LIB_TDEIO)
 
-fileshare_propsdlgplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+fileshare_propsdlgplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 AM_CPPFLAGS = -I../kcm_sambaconf $(all_includes)
 
diff --git a/kdict/applet/Makefile.am b/kdict/applet/Makefile.am
index 0dbd15d3..f95d12e4 100644
--- a/kdict/applet/Makefile.am
+++ b/kdict/applet/Makefile.am
@@ -12,7 +12,7 @@ lnk_DATA = kdictapplet.desktop
 
 EXTRA_DIST = $(lnk_DATA)
 
-kdict_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kdict_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kdict_panelapplet_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDEUI)
 
 messages: rc.cpp
diff --git a/kget/Makefile.am b/kget/Makefile.am
index 15c83ce7..e2875e71 100644
--- a/kget/Makefile.am
+++ b/kget/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = $(all_includes)
 
 bin_PROGRAMS = kget
 
-kget_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_QT)
+kget_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_TQT)
 kget_LDADD   = $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIBSOCKET)
 kget_SOURCES = getfilejob.cpp slaveevent.cpp slave.cpp transferlist.cpp \
                transfer.cpp settings.cpp logwindow.cpp \
diff --git a/kget/kget_plug_in/Makefile.am b/kget/kget_plug_in/Makefile.am
index f092d463..8ac2045d 100644
--- a/kget/kget_plug_in/Makefile.am
+++ b/kget/kget_plug_in/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = tdehtml_kget.la
 tdehtml_kget_la_METASOURCES = AUTO
 tdehtml_kget_la_SOURCES = kget_plug_in.cpp kget_linkview.cpp links.cpp
 tdehtml_kget_la_LIBADD =  $(LIB_TDEHTML)
-tdehtml_kget_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS)
+tdehtml_kget_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS)
 
 KDE_ICON = AUTO
 
diff --git a/knewsticker/Makefile.am b/knewsticker/Makefile.am
index 361cf025..2b48d92b 100644
--- a/knewsticker/Makefile.am
+++ b/knewsticker/Makefile.am
@@ -11,7 +11,7 @@ knewsticker_panelapplet_la_SOURCES = newsscroller.cpp \
 	knewsticker.cpp knewsticker.skel \
 	knewstickerconfig.cpp knewstickerconfigwidget.ui \
 	newssourcedlgimpl.cpp newssourcedlg.ui
-knewsticker_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+knewsticker_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 knewsticker_panelapplet_la_LIBADD = common/libknewstickercommon.la \
 	$(LIB_TDEIO) $(LIB_TDEUI)
 
diff --git a/knewsticker/knewstickerstub/Makefile.am b/knewsticker/knewstickerstub/Makefile.am
index 2bf305c6..92a93cb2 100644
--- a/knewsticker/knewstickerstub/Makefile.am
+++ b/knewsticker/knewstickerstub/Makefile.am
@@ -8,6 +8,6 @@ service_DATA = knewstickerstub.desktop
 METASOURCES = AUTO
 
 knewstickerstub_SOURCES = knewstickerstub.cpp
-knewstickerstub_LDADD = $(LIB_TDEIO) ../common/libknewstickercommon.la $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
-knewstickerstub_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
+knewstickerstub_LDADD = $(LIB_TDEIO) ../common/libknewstickercommon.la $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
+knewstickerstub_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
 
diff --git a/knewsticker/kntsrcfilepropsdlg/Makefile.am b/knewsticker/kntsrcfilepropsdlg/Makefile.am
index 4d6c0828..726fe744 100644
--- a/knewsticker/kntsrcfilepropsdlg/Makefile.am
+++ b/knewsticker/kntsrcfilepropsdlg/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libkntsrcfilepropsdlg.la
 
 libkntsrcfilepropsdlg_la_SOURCES = kntsrcfilepropsdlg.cpp \
 	kntsrcfilepropsdlgwidget.ui
-libkntsrcfilepropsdlg_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+libkntsrcfilepropsdlg_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 libkntsrcfilepropsdlg_la_LIBADD = $(LIB_TDEIO) ../common/libknewstickercommon.la ../../librss/librss.la
 libkntsrcfilepropsdlg_la_METASOURCES = AUTO
 
diff --git a/kopete/kopete/Makefile.am b/kopete/kopete/Makefile.am
index 1ca1a35e..9bd93395 100644
--- a/kopete/kopete/Makefile.am
+++ b/kopete/kopete/Makefile.am
@@ -33,7 +33,7 @@ kopete_SOURCES = main.cpp 	kopeteapplication.cpp kopeteiface.cpp \
 
 kimiface_DIR = $(kde_includes)
 
-kopete_LDFLAGS = -no-undefined $(all_libraries) $(KDE_RPATH) -ltdetexteditor $(LIB_QT) $(LIB_TDECORE) -ltdefx -lDCOP
+kopete_LDFLAGS = -no-undefined $(all_libraries) $(KDE_RPATH) -ltdetexteditor $(LIB_TQT) $(LIB_TDECORE) -ltdefx -lDCOP
 kopete_LDADD = \
 	addcontactwizard/libkopeteaddcontactwizard.la \
 	addaccountwizard/libkopeteaddaccountwizard.la \
diff --git a/kopete/kopete/chatwindow/Makefile.am b/kopete/kopete/chatwindow/Makefile.am
index 3f6518d5..2c3de33d 100644
--- a/kopete/kopete/chatwindow/Makefile.am
+++ b/kopete/kopete/chatwindow/Makefile.am
@@ -6,21 +6,21 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(KOPETE_COMPAT_INCLUDES) -I$(top_srcdir)/kopet
 
 kopete_chatwindow_la_SOURCES = chatview.cpp kopetechatwindow.cpp chatmemberslistwidget.cpp
 kopete_chatwindow_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
-kopete_chatwindow_la_LIBADD = ../../libkopete/libkopete.la ./libkopetechatwindow.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS)
+kopete_chatwindow_la_LIBADD = ../../libkopete/libkopete.la ./libkopetechatwindow.la $(LIB_KOPETECOMPAT) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS)
 
 kopete_emailwindow_la_SOURCES = kopeteemailwindow.cpp
 kopete_emailwindow_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
-kopete_emailwindow_la_LIBADD = ../../libkopete/libkopete.la ./libkopetechatwindow.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS)
+kopete_emailwindow_la_LIBADD = ../../libkopete/libkopete.la ./libkopetechatwindow.la $(LIB_KOPETECOMPAT) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS)
 
 libkrichtexteditpart_la_SOURCES = krichtexteditpart.cpp
 libkrichtexteditpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH)
-libkrichtexteditpart_la_LIBADD = ../../libkopete/libkopete.la $(LIB_TDEPARTS) $(LIB_TDESPELL) $(LIB_TDEPRINT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+libkrichtexteditpart_la_LIBADD = ../../libkopete/libkopete.la $(LIB_TDEPARTS) $(LIB_TDESPELL) $(LIB_TDEPRINT) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 libkopetechatwindow_la_SOURCES = chatmessagepart.cpp emoticonselector.cpp kopeteemoticonaction.cpp \
 	chattexteditpart.cpp krichtexteditpart.cpp kopetechatwindowstylemanager.cpp \
 	kopetechatwindowstyle.cpp 
 libkopetechatwindow_la_LDFLAGS = $(all_libraries) -no-undefined
-libkopetechatwindow_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS)
+libkopetechatwindow_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KOPETECOMPAT) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS)
 
 partdir = $(kde_datadir)/kopeterichtexteditpart
 part_DATA = kopeterichtexteditpartfull.rc
diff --git a/kopete/kopete/config/accounts/Makefile.am b/kopete/kopete/config/accounts/Makefile.am
index b455b396..80f207e0 100644
--- a/kopete/kopete/config/accounts/Makefile.am
+++ b/kopete/kopete/config/accounts/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(KOPETE_COMPAT_INCLUDES) $(all_includes) -I$(k
 kde_module_LTLIBRARIES = kcm_kopete_accountconfig.la
 
 kcm_kopete_accountconfig_la_SOURCES = kopeteaccountconfigbase.ui kopeteaccountconfig.cpp
-kcm_kopete_accountconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_accountconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kcm_kopete_accountconfig_la_LIBADD  = ../../../libkopete/libkopete.la ../../addaccountwizard/libkopeteaddaccountwizard.la $(LIB_KOPETECOMPAT) $(LIB_TDEUTILS)
 
 service_DATA = kopete_accountconfig.desktop
diff --git a/kopete/kopete/config/avdevice/Makefile.am b/kopete/kopete/config/avdevice/Makefile.am
index 5e588a23..282fe492 100644
--- a/kopete/kopete/config/avdevice/Makefile.am
+++ b/kopete/kopete/config/avdevice/Makefile.am
@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kcm_kopete_avdeviceconfig.la
 kcm_kopete_avdeviceconfig_la_SOURCES = avdeviceconfig.cpp \
 	avdeviceconfig_videoconfig.ui
 
-kcm_kopete_avdeviceconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_avdeviceconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 kcm_kopete_avdeviceconfig_la_LIBADD  = ../../../libkopete/libkopete.la \
 	../../../libkopete/avdevice/libkopete_videodevice.la \
diff --git a/kopete/kopete/config/behavior/Makefile.am b/kopete/kopete/config/behavior/Makefile.am
index 33866039..cfe8bea5 100644
--- a/kopete/kopete/config/behavior/Makefile.am
+++ b/kopete/kopete/config/behavior/Makefile.am
@@ -7,7 +7,7 @@ kcm_kopete_behaviorconfig_la_SOURCES = \
 	kopeteawayconfigbase.ui  \
 	behaviorconfig_chat.ui behaviorconfig_general.ui behaviorconfig_events.ui behaviorconfig.cpp
 
-kcm_kopete_behaviorconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_behaviorconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 kcm_kopete_behaviorconfig_la_LIBADD  = ../../../libkopete/libkopete.la \
 	$(LIB_KOPETECOMPAT) $(LIB_TDEUTILS)
diff --git a/kopete/kopete/config/identity/Makefile.am b/kopete/kopete/config/identity/Makefile.am
index 64fdf05c..98b943f7 100644
--- a/kopete/kopete/config/identity/Makefile.am
+++ b/kopete/kopete/config/identity/Makefile.am
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_kopete_identityconfig.la
 kcm_kopete_identityconfig_la_SOURCES = kopeteidentityconfigbase.ui \
 		kopeteidentityconfig.cpp globalidentitiesmanager.cpp kopeteidentityconfigpreferences.kcfgc
 kcm_kopete_identityconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
-kcm_kopete_identityconfig_la_LIBADD  = -ltdeabc ../../../libkopete/libkopete.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_identityconfig_la_LIBADD  = -ltdeabc ../../../libkopete/libkopete.la $(LIB_KOPETECOMPAT) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 service_DATA = kopete_identityconfig.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/kopete/tdeconf_update/Makefile.am b/kopete/kopete/tdeconf_update/Makefile.am
index c997a2af..76221dbc 100644
--- a/kopete/kopete/tdeconf_update/Makefile.am
+++ b/kopete/kopete/tdeconf_update/Makefile.am
@@ -17,16 +17,16 @@ tdeconf_PROGRAMS = kopete-account-tdeconf_update kopete-pluginloader2-tdeconf_up
 tdeconfdir = $(libdir)/tdeconf_update_bin
 
 kopete_account_tdeconf_update_SOURCES = kopete-account-tdeconf_update.cpp
-kopete_account_tdeconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-kopete_account_tdeconf_update_LDADD = $(LIB_QT)
+kopete_account_tdeconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kopete_account_tdeconf_update_LDADD = $(LIB_TQT)
 
 kopete_pluginloader2_tdeconf_update_SOURCES = kopete-pluginloader2.cpp
-kopete_pluginloader2_tdeconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-kopete_pluginloader2_tdeconf_update_LDADD = $(LIB_QT)
+kopete_pluginloader2_tdeconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kopete_pluginloader2_tdeconf_update_LDADD = $(LIB_TQT)
 
 kopete_nameTracking_tdeconf_update_SOURCES = kopete-nameTracking.cpp
-kopete_nameTracking_tdeconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-kopete_nameTracking_tdeconf_update_LDADD = $(LIB_QT) $(LIB_TDECORE)
+kopete_nameTracking_tdeconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kopete_nameTracking_tdeconf_update_LDADD = $(LIB_TQT) $(LIB_TDECORE)
 
 # vim: set noet:
 
diff --git a/kopete/libkopete/avdevice/Makefile.am b/kopete/libkopete/avdevice/Makefile.am
index 9036b3f2..a968ae84 100644
--- a/kopete/libkopete/avdevice/Makefile.am
+++ b/kopete/libkopete/avdevice/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -DQT_NO_CAST_ASCII -DQT_NO_ASCII_CA
 METASOURCES = AUTO
 lib_LTLIBRARIES = libkopete_videodevice.la
 noinst_LTLIBRARIES = libkvideoio.la
-libkopete_videodevice_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+libkopete_videodevice_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 noinst_HEADERS = kxv.h qvideo.h qvideostream.h videocontrol.h videodevice.h \
 	videodevicemodelpool.h videodevicepool.h videoinput.h \
@@ -15,4 +15,4 @@ libkopete_videodevice_la_SOURCES = videocontrol.cpp videodevice.cpp \
 	sonix_compress.cpp bayer.cpp
 libkvideoio_la_LDFLAGS = -no-undefined $(all_libraries) -version-info 1:0:0
 libkvideoio_la_SOURCES = kxv.cpp qvideo.cpp qvideostream.cpp
-libkvideoio_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(GLLIB)
+libkvideoio_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(GLLIB)
diff --git a/kopete/plugins/addbookmarks/Makefile.am b/kopete/plugins/addbookmarks/Makefile.am
index 409535f6..8cfcb2fd 100644
--- a/kopete/plugins/addbookmarks/Makefile.am
+++ b/kopete/plugins/addbookmarks/Makefile.am
@@ -6,11 +6,11 @@ noinst_HEADERS = addbookmarksplugin.h addbookmarkspreferences.h \
 
 kde_module_LTLIBRARIES = kopete_addbookmarks.la kcm_kopete_addbookmarks.la
 
-kopete_addbookmarks_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kopete_addbookmarks_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_addbookmarks_la_LIBADD = ../../libkopete/libkopete.la
 kopete_addbookmarks_la_SOURCES = addbookmarksplugin.cpp addbookmarksprefssettings.cpp
 
-kcm_kopete_addbookmarks_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_addbookmarks_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kcm_kopete_addbookmarks_la_LIBADD = ../../libkopete/libkopete.la $(LIB_TDEUTILS)
 kcm_kopete_addbookmarks_la_SOURCES = addbookmarkspreferences.cpp addbookmarksprefsui.ui \
                                      addbookmarksprefssettings.cpp
diff --git a/kopete/plugins/alias/Makefile.am b/kopete/plugins/alias/Makefile.am
index e5de8be3..d49f5ed6 100644
--- a/kopete/plugins/alias/Makefile.am
+++ b/kopete/plugins/alias/Makefile.am
@@ -4,11 +4,11 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = kopete_alias.la kcm_kopete_alias.la
 
 kopete_alias_la_SOURCES     = aliasplugin.cpp
-kopete_alias_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kopete_alias_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_alias_la_LIBADD      = ../../libkopete/libkopete.la
 
 kcm_kopete_alias_la_SOURCES     = aliaspreferences.cpp aliasdialogbase.ui aliasdialog.ui editaliasdialog.cpp
-kcm_kopete_alias_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_alias_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kcm_kopete_alias_la_LIBADD      = $(LIB_KOPETECOMPAT) $(LIB_TDEUTILS) ../../libkopete/libkopete.la
 
 service_DATA = kopete_alias.desktop
diff --git a/kopete/plugins/autoreplace/Makefile.am b/kopete/plugins/autoreplace/Makefile.am
index 5ac7bcd8..3a4455bf 100644
--- a/kopete/plugins/autoreplace/Makefile.am
+++ b/kopete/plugins/autoreplace/Makefile.am
@@ -6,11 +6,11 @@ SUBDIRS = icons
 kde_module_LTLIBRARIES = kopete_autoreplace.la kcm_kopete_autoreplace.la
 
 kopete_autoreplace_la_SOURCES     = autoreplaceplugin.cpp autoreplaceconfig.cpp
-kopete_autoreplace_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kopete_autoreplace_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_autoreplace_la_LIBADD      = ../../libkopete/libkopete.la
 
 kcm_kopete_autoreplace_la_SOURCES     = autoreplacepreferences.cpp autoreplaceconfig.cpp autoreplaceprefs.ui
-kcm_kopete_autoreplace_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_autoreplace_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kcm_kopete_autoreplace_la_LIBADD      = ../../libkopete/libkopete.la $(LIB_TDEUTILS)
 
 service_DATA = kopete_autoreplace.desktop
diff --git a/kopete/plugins/connectionstatus/Makefile.am b/kopete/plugins/connectionstatus/Makefile.am
index e341af6d..93b756e3 100644
--- a/kopete/plugins/connectionstatus/Makefile.am
+++ b/kopete/plugins/connectionstatus/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = kopete_connectionstatus.la
 
 kopete_connectionstatus_la_SOURCES     = connectionstatusplugin.cpp
-kopete_connectionstatus_la_LDFLAGS     = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kopete_connectionstatus_la_LDFLAGS     = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_connectionstatus_la_LIBADD      = ../../libkopete/libkopete.la
 
 service_DATA = kopete_connectionstatus.desktop
diff --git a/kopete/plugins/contactnotes/Makefile.am b/kopete/plugins/contactnotes/Makefile.am
index 555f351b..b36bb5b6 100644
--- a/kopete/plugins/contactnotes/Makefile.am
+++ b/kopete/plugins/contactnotes/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = kopete_contactnotes.la
 
 kopete_contactnotes_la_SOURCES     = contactnotesplugin.cpp contactnotesedit.cpp
-kopete_contactnotes_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kopete_contactnotes_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_contactnotes_la_LIBADD      = ../../libkopete/libkopete.la -ltdeio
 
 service_DATA = kopete_contactnotes.desktop
diff --git a/kopete/plugins/cryptography/Makefile.am b/kopete/plugins/cryptography/Makefile.am
index ff3e4ba7..b2c1c8a0 100644
--- a/kopete/plugins/cryptography/Makefile.am
+++ b/kopete/plugins/cryptography/Makefile.am
@@ -7,11 +7,11 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = kopete_cryptography.la kcm_kopete_cryptography.la
 
 kopete_cryptography_la_SOURCES     = cryptographyplugin.cpp kgpginterface.cpp cryptographyguiclient.cpp cryptographyselectuserkey.cpp cryptographyuserkey_ui.ui popuppublic.cpp kgpgselkey.cpp
-kopete_cryptography_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kopete_cryptography_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_cryptography_la_LIBADD      = ../../libkopete/libkopete.la
 
 kcm_kopete_cryptography_la_SOURCES = cryptographypreferences.cpp cryptographyprefsbase.ui  kgpgselkey.cpp
-kcm_kopete_cryptography_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_cryptography_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kcm_kopete_cryptography_la_LIBADD  = ../../libkopete/libkopete.la $(LIB_TDEUTILS)
 
 service_DATA = kopete_cryptography.desktop
diff --git a/kopete/plugins/highlight/Makefile.am b/kopete/plugins/highlight/Makefile.am
index c05b9698..1075b5f7 100644
--- a/kopete/plugins/highlight/Makefile.am
+++ b/kopete/plugins/highlight/Makefile.am
@@ -7,11 +7,11 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = kopete_highlight.la kcm_kopete_highlight.la
 
 kopete_highlight_la_SOURCES = highlightplugin.cpp highlightconfig.cpp filter.cpp
-kopete_highlight_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kopete_highlight_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_highlight_la_LIBADD      = ../../libkopete/libkopete.la
 
 kcm_kopete_highlight_la_SOURCES = highlightprefsbase.ui highlightpreferences.cpp filter.cpp highlightconfig.cpp
-kcm_kopete_highlight_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_highlight_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kcm_kopete_highlight_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_TDEUTILS)
 
 service_DATA = kopete_highlight.desktop
diff --git a/kopete/plugins/history/Makefile.am b/kopete/plugins/history/Makefile.am
index ec87074d..0193d8ee 100644
--- a/kopete/plugins/history/Makefile.am
+++ b/kopete/plugins/history/Makefile.am
@@ -7,11 +7,11 @@ kde_module_LTLIBRARIES = kopete_history.la kcm_kopete_history.la
 kopete_history_la_SOURCES = historyplugin.cpp historydialog.cpp historyviewer.ui\
 	historylogger.cpp converter.cpp historyguiclient.cpp historyconfig.kcfgc
 
-kopete_history_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEHTML) $(LIB_TDEUTILS)
+kopete_history_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEHTML) $(LIB_TDEUTILS)
 kopete_history_la_LIBADD      = ../../libkopete/libkopete.la
 
 kcm_kopete_history_la_SOURCES = historyprefsui.ui historypreferences.cpp  historyconfig.kcfgc
-kcm_kopete_history_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEHTML) $(LIB_TDEUTILS)
+kcm_kopete_history_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEHTML) $(LIB_TDEUTILS)
 kcm_kopete_history_la_LIBADD  = ../../libkopete/libkopete.la $(LIB_TDEUTILS)
 
 service_DATA = kopete_history.desktop
diff --git a/kopete/plugins/latex/Makefile.am b/kopete/plugins/latex/Makefile.am
index 32198ae9..f3a94679 100644
--- a/kopete/plugins/latex/Makefile.am
+++ b/kopete/plugins/latex/Makefile.am
@@ -7,11 +7,11 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = kopete_latex.la kcm_kopete_latex.la
 
 kopete_latex_la_SOURCES = latexplugin.cpp latexconfig.kcfgc latexguiclient.cpp
-kopete_latex_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kopete_latex_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_latex_la_LIBADD      = ../../libkopete/libkopete.la
 
 kcm_kopete_latex_la_SOURCES = latexprefsbase.ui latexpreferences.cpp latexconfig.kcfgc
-kcm_kopete_latex_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_latex_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kcm_kopete_latex_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_TDEUTILS)
 
 service_DATA = kopete_latex.desktop
diff --git a/kopete/plugins/nowlistening/Makefile.am b/kopete/plugins/nowlistening/Makefile.am
index ac968eab..60ca64e2 100644
--- a/kopete/plugins/nowlistening/Makefile.am
+++ b/kopete/plugins/nowlistening/Makefile.am
@@ -5,11 +5,11 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(XMMS_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = kopete_nowlistening.la kcm_kopete_nowlistening.la
 
 kopete_nowlistening_la_SOURCES = nowlisteningconfig.kcfgc nowlisteningplugin.cpp nlkscd.cpp nlnoatun.cpp nlxmms.cpp nowlisteningguiclient.cpp nljuk.cpp nlamarok.cpp nlkaffeine.cpp
-kopete_nowlistening_la_LDFLAGS     = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kopete_nowlistening_la_LDFLAGS     = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_nowlistening_la_LIBADD      = ../../libkopete/libkopete.la
 
 kcm_kopete_nowlistening_la_SOURCES = nowlisteningprefs.ui nowlisteningpreferences.cpp nowlisteningconfig.kcfgc
-kcm_kopete_nowlistening_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_nowlistening_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kcm_kopete_nowlistening_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_TDEUTILS)
 
 service_DATA = kopete_nowlistening.desktop
diff --git a/kopete/plugins/smpppdcs/unittest/Makefile.am b/kopete/plugins/smpppdcs/unittest/Makefile.am
index b17fca53..e91997a2 100644
--- a/kopete/plugins/smpppdcs/unittest/Makefile.am
+++ b/kopete/plugins/smpppdcs/unittest/Makefile.am
@@ -5,7 +5,7 @@ METASOURCES = AUTO
 check_PROGRAMS = smpppdcstests
 
 smpppdcstests_SOURCES = main.cpp clienttest.cpp
-smpppdcstests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+smpppdcstests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 smpppdcstests_LDADD = ../libsmpppdclient/libsmpppdclient.la -ltdeunittestgui
 
 noinst_HEADERS = clienttest.h
diff --git a/kopete/plugins/statistics/Makefile.am b/kopete/plugins/statistics/Makefile.am
index 1a27e4f3..710989e9 100644
--- a/kopete/plugins/statistics/Makefile.am
+++ b/kopete/plugins/statistics/Makefile.am
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kopete_statistics.la
 
 kopete_statistics_la_SOURCES = statisticsplugin.cpp statisticsdb.cpp statisticsdialog.cpp statisticswidget.ui statisticscontact.cpp statisticsdcopiface.skel
 
-kopete_statistics_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) -lsqlite3 $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEHTML)
+kopete_statistics_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) -lsqlite3 $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEHTML)
 kopete_statistics_la_LIBADD      = ../../libkopete/libkopete.la -lsqlite3
 
 service_DATA = kopete_statistics.desktop
diff --git a/kopete/plugins/texteffect/Makefile.am b/kopete/plugins/texteffect/Makefile.am
index 7f4c7d2e..e38f5028 100644
--- a/kopete/plugins/texteffect/Makefile.am
+++ b/kopete/plugins/texteffect/Makefile.am
@@ -6,11 +6,11 @@ INCLUDES = $(KOPETE_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = kopete_texteffect.la kcm_kopete_texteffect.la
 
 kopete_texteffect_la_SOURCES     = texteffectplugin.cpp texteffectconfig.cpp
-kopete_texteffect_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kopete_texteffect_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_texteffect_la_LIBADD      = ../../libkopete/libkopete.la
 
 kcm_kopete_texteffect_la_SOURCES = texteffectconfig.cpp texteffectprefs.ui texteffectpreferences.cpp
-kcm_kopete_texteffect_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_texteffect_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kcm_kopete_texteffect_la_LIBADD  = ../../libkopete/libkopete.la $(LIB_TDEUTILS)
 
 service_DATA = kopete_texteffect.desktop
diff --git a/kopete/plugins/translator/Makefile.am b/kopete/plugins/translator/Makefile.am
index 8c8be5bc..5f13158b 100644
--- a/kopete/plugins/translator/Makefile.am
+++ b/kopete/plugins/translator/Makefile.am
@@ -6,11 +6,11 @@ kde_module_LTLIBRARIES = kopete_translator.la kcm_kopete_translator.la
 
 kopete_translator_la_SOURCES     = translatorplugin.cpp  \
     translatordialog.cpp translatorguiclient.cpp translatorlanguages.cpp
-kopete_translator_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kopete_translator_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_translator_la_LIBADD      = ../../libkopete/libkopete.la $(LIB_TDEIO)
 
 kcm_kopete_translator_la_SOURCES = translatorprefsbase.ui translatorprefs.cpp translatorlanguages.cpp
-kcm_kopete_translator_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_translator_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kcm_kopete_translator_la_LIBADD  = ../../libkopete/libkopete.la $(LIB_TDEUTILS)
 
 service_DATA = kopete_translator.desktop
diff --git a/kopete/plugins/webpresence/Makefile.am b/kopete/plugins/webpresence/Makefile.am
index ff55a95f..2380cb90 100644
--- a/kopete/plugins/webpresence/Makefile.am
+++ b/kopete/plugins/webpresence/Makefile.am
@@ -6,11 +6,11 @@ kde_module_LTLIBRARIES = kopete_webpresence.la kcm_kopete_webpresence.la
 
 kopete_webpresence_la_SOURCES     = webpresenceplugin.cpp
 
-kopete_webpresence_la_LDFLAGS     = -module  -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kopete_webpresence_la_LDFLAGS     = -module  -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_webpresence_la_LIBADD      = ../../libkopete/libkopete.la $(LIBXML_LIBS) $(LIBXSLT_LIBS)
 
 kcm_kopete_webpresence_la_SOURCES = webpresencepreferences.cpp webpresenceprefs.ui
-kcm_kopete_webpresence_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_webpresence_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kcm_kopete_webpresence_la_LIBADD  = ../../libkopete/libkopete.la  $(LIB_TDEUTILS)
 
 service_DATA = kopete_webpresence.desktop
diff --git a/kopete/protocols/gadu/Makefile.am b/kopete/protocols/gadu/Makefile.am
index f8741e94..8f449b20 100644
--- a/kopete/protocols/gadu/Makefile.am
+++ b/kopete/protocols/gadu/Makefile.am
@@ -22,7 +22,7 @@ kopete_gadu_la_SOURCES = gaduaway.cpp gadueditcontact.cpp gaducommands.cpp \
 			 gaducontactlist.cpp gadurichtextformat.cpp \
 			 gadudccserver.cpp gadudcctransaction.cpp gadudcc.cpp
 
-kopete_gadu_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lgadu
+kopete_gadu_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lgadu
 kopete_gadu_la_LIBADD  = ./ui/libgaduui.la \
 		       $(top_builddir)/kopete/libkopete/libkopete.la \
 		       $(GG_LIBS)
diff --git a/kopete/protocols/groupwise/Makefile.am b/kopete/protocols/groupwise/Makefile.am
index 955637aa..2110fc2b 100644
--- a/kopete/protocols/groupwise/Makefile.am
+++ b/kopete/protocols/groupwise/Makefile.am
@@ -12,7 +12,7 @@ kde_module_LTLIBRARIES =  kopete_groupwise.la
 kopete_groupwise_la_SOURCES = gwprotocol.cpp gwcontact.cpp gwaccount.cpp \
 		gwbytestream.cpp gwconnector.cpp gwmessagemanager.cpp gwcontactlist.cpp
 kopete_groupwise_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) \
-	$(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+	$(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_groupwise_la_LIBADD = ui/libkopetegroupwiseui.la \
 	libgroupwise/libgroupwise.la ../../libkopete/libkopete.la $(LIB_TDEIO)
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/Makefile.am b/kopete/protocols/groupwise/libgroupwise/tasks/Makefile.am
index cf966ca2..37a9928d 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/Makefile.am
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/Makefile.am
@@ -24,7 +24,7 @@ noinst_HEADERS = requesttask.h eventtask.h logintask.h setstatustask.h \
 
 
 libgroupwise_tasks_la_LDFLAGS = -no-undefined $(all_libraries)
-libgroupwise_tasks_la_LIBADD = $(LIB_QT)
+libgroupwise_tasks_la_LIBADD = $(LIB_TQT)
 
 
 
diff --git a/kopete/protocols/irc/Makefile.am b/kopete/protocols/irc/Makefile.am
index fb386b8d..d2208d5e 100644
--- a/kopete/protocols/irc/Makefile.am
+++ b/kopete/protocols/irc/Makefile.am
@@ -22,7 +22,7 @@ kopete_irc_la_SOURCES = \
 	kcodecaction.cpp \
 	ksparser.cpp
 
-kopete_irc_la_LDFLAGS     = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEHTML)
+kopete_irc_la_LDFLAGS     = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEHTML)
 kopete_irc_la_LIBADD      = ../../libkopete/libkopete.la \
 		./ui/libkopeteircui.la \
 		./libkirc/libkirc.la \
diff --git a/kopete/protocols/jabber/Makefile.am b/kopete/protocols/jabber/Makefile.am
index 40f24e0c..1c228bf0 100644
--- a/kopete/protocols/jabber/Makefile.am
+++ b/kopete/protocols/jabber/Makefile.am
@@ -44,7 +44,7 @@ kopete_jabber_la_SOURCES = \
 	jabbertransport.cpp\
 	jabberbookmarks.cpp
 
-kopete_jabber_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kopete_jabber_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_jabber_la_LIBADD  = $(top_builddir)/kopete/libkopete/libkopete.la \
 	ui/libkopetejabberui.la \
 	libiris/iris/include/libiris.la \
diff --git a/kopete/protocols/jabber/tdeioslave/Makefile.am b/kopete/protocols/jabber/tdeioslave/Makefile.am
index ed5b3da3..f5d90dc7 100644
--- a/kopete/protocols/jabber/tdeioslave/Makefile.am
+++ b/kopete/protocols/jabber/tdeioslave/Makefile.am
@@ -14,7 +14,7 @@ kde_module_LTLIBRARIES = tdeio_jabberdisco.la
 
 tdeio_jabberdisco_la_SOURCES = jabberdisco.cpp
 tdeio_jabberdisco_la_LIBADD = ../libjabberclient.la ../libiris/qca/src/libqca.la ../libiris/iris/include/libiris.la ../libiris/iris/xmpp-im/libiris_xmpp_im.la ../libiris/iris/xmpp-core/libiris_xmpp_core.la ../libiris/iris/jabber/libiris_jabber.la ../libiris/cutestuff/util/libcutestuff_util.la ../libiris/cutestuff/network/libcutestuff_network.la $(LIB_TDEIO)
-tdeio_jabberdisco_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdeio_jabberdisco_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 noinst_HEADERS = jabberdisco.h
 
diff --git a/kopete/protocols/meanwhile/Makefile.am b/kopete/protocols/meanwhile/Makefile.am
index 20a03725..1abeb22c 100644
--- a/kopete/protocols/meanwhile/Makefile.am
+++ b/kopete/protocols/meanwhile/Makefile.am
@@ -28,7 +28,7 @@ kopete_meanwhile_la_SOURCES = \
 	meanwhileplugin.cpp
 
 kopete_meanwhile_la_LDFLAGS = -no-undefined -module \
-	$(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+	$(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 kopete_meanwhile_la_LIBADD = $(top_builddir)/kopete/libkopete/libkopete.la \
 	ui/libkopetemeanwhileui.la $(MEANWHILE_LIBS)
diff --git a/kopete/protocols/oscar/icq/Makefile.am b/kopete/protocols/oscar/icq/Makefile.am
index 81d1f488..f4139d20 100644
--- a/kopete/protocols/oscar/icq/Makefile.am
+++ b/kopete/protocols/oscar/icq/Makefile.am
@@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = kopete_icq.la
 kopete_icq_la_SOURCES = icqpresence.cpp icqaccount.cpp icqcontact.cpp icqprotocol.cpp
 # icquserinfo.cpp icqreadaway.cpp icqsendsmsdialog.cpp
 
-kopete_icq_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kopete_icq_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_icq_la_LIBADD  = ../libkopete_oscar.la \
 	$(top_builddir)/kopete/libkopete/libkopete.la ui/libkopeteicqui.la
 
diff --git a/kopete/protocols/oscar/liboscar/Makefile.am b/kopete/protocols/oscar/liboscar/Makefile.am
index 2a235e83..5a0e0d97 100644
--- a/kopete/protocols/oscar/liboscar/Makefile.am
+++ b/kopete/protocols/oscar/liboscar/Makefile.am
@@ -22,5 +22,5 @@ liboscar_la_SOURCES = oscarutils.cpp client.cpp task.cpp connector.cpp \
 	chatnavservicetask.cpp connectionhandler.cpp chatservicetask.cpp
 
 liboscar_la_LDFLAGS = -no-undefined $(all_libraries)
-liboscar_la_LIBADD = $(LIB_QT) $(LIB_TDECORE)
+liboscar_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE)
 
diff --git a/kopete/protocols/oscar/liboscar/tests/Makefile.am b/kopete/protocols/oscar/liboscar/tests/Makefile.am
index 72fd8d64..f95a47c2 100644
--- a/kopete/protocols/oscar/liboscar/tests/Makefile.am
+++ b/kopete/protocols/oscar/liboscar/tests/Makefile.am
@@ -3,26 +3,26 @@ METASOURCES = AUTO
 check_PROGRAMS = tdeunittest clientstream_test logintest userinfotest ssigrouptest redirecttest ipaddrtest
 
 tdeunittest_SOURCES = main.cpp tdeunittest.cpp chatnavtests.cpp
-tdeunittest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdeunittest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 tdeunittest_LDADD = $(LIB_TDECORE) ../liboscar.la
 
 clientstream_test_SOURCES = clientstream_test.cpp
-clientstream_test_LDADD = $(LIB_QT) $(LIB_TDECORE) ../liboscar.la
+clientstream_test_LDADD = $(LIB_TQT) $(LIB_TDECORE) ../liboscar.la
 
 logintest_SOURCES = logintest.cpp
-logintest_LDADD = $(LIB_QT) $(LIB_TDECORE) ../liboscar.la
+logintest_LDADD = $(LIB_TQT) $(LIB_TDECORE) ../liboscar.la
 
 userinfotest_SOURCES = userinfotest.cpp
-userinfotest_LDADD = $(LIB_QT) $(LIB_TDECORE) ../liboscar.la
+userinfotest_LDADD = $(LIB_TQT) $(LIB_TDECORE) ../liboscar.la
 
 ssigrouptest_SOURCES = ssigrouptest.cpp
-ssigrouptest_LDADD = $(LIB_QT) $(LIB_TDECORE) ../liboscar.la
+ssigrouptest_LDADD = $(LIB_TQT) $(LIB_TDECORE) ../liboscar.la
 
 redirecttest_SOURCES = redirecttest.cpp
-redirecttest_LDADD = $(LIB_QT) $(LIB_TDECORE) ../liboscar.la
+redirecttest_LDADD = $(LIB_TQT) $(LIB_TDECORE) ../liboscar.la
 
 ipaddrtest_SOURCES = ipaddrtest.cpp
-ipaddrtest_LDADD = $(LIB_QT) $(LIB_TDECORE) ../liboscar.la
+ipaddrtest_LDADD = $(LIB_TQT) $(LIB_TDECORE) ../liboscar.la
 
 check: tdeunittest
 	@./tdeunittest 2>&1 | grep "tests:"
diff --git a/kopete/protocols/testbed/Makefile.am b/kopete/protocols/testbed/Makefile.am
index 4bc8e209..7a7c5186 100644
--- a/kopete/protocols/testbed/Makefile.am
+++ b/kopete/protocols/testbed/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) -I$(srcdir)/ui -Iui $(all_includes)
 noinst_HEADERS = testbedprotocol.h testbedcontact.h testbedaccount.h testbedaddcontactpage.h testbededitaccountwidget.h testbedfakeserver.h testbedincomingmessage.h
 kde_module_LTLIBRARIES =  kopete_testbed.la
 kopete_testbed_la_SOURCES = testbedprotocol.cpp testbedcontact.cpp testbedaccount.cpp testbedaddcontactpage.cpp testbedaddui.ui testbededitaccountwidget.cpp testbedaccountpreferences.ui testbedfakeserver.cpp testbedincomingmessage.cpp
-kopete_testbed_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kopete_testbed_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_testbed_la_LIBADD = ../../libkopete/avdevice/libkopete_videodevice.la \
 	ui/libkopetetestbedui.la ../../libkopete/libkopete.la $(LIB_TDEIO)
 
diff --git a/kopete/protocols/winpopup/Makefile.am b/kopete/protocols/winpopup/Makefile.am
index ac798166..ae0785cb 100644
--- a/kopete/protocols/winpopup/Makefile.am
+++ b/kopete/protocols/winpopup/Makefile.am
@@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = kopete_wp.la
 noinst_HEADERS = wpprotocol.h wpeditaccount.h wpaccount.h wpuserinfo.h wpcontact.h wpaddcontact.h
 
 kopete_wp_la_SOURCES = wpprotocol.cpp wpcontact.cpp  wpaddcontact.cpp wpeditaccount.cpp  wpaccount.cpp wpuserinfo.cpp
-kopete_wp_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kopete_wp_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_wp_la_LIBADD = ../../libkopete/libkopete.la ./ui/libkopetewpui.la \
 	./libwinpopup/libwinpopup.la $(LIB_TDEIO)
 
diff --git a/kopete/protocols/yahoo/Makefile.am b/kopete/protocols/yahoo/Makefile.am
index a0ef0fe7..7d7e325d 100644
--- a/kopete/protocols/yahoo/Makefile.am
+++ b/kopete/protocols/yahoo/Makefile.am
@@ -12,7 +12,7 @@ kde_module_LTLIBRARIES = kopete_yahoo.la
 kopete_yahoo_la_SOURCES = yahooprotocol.cpp yahoocontact.cpp \
 	yahooaddcontact.cpp yahooaccount.cpp yahooeditaccount.cpp yahooconferencemessagemanager.cpp \
 	yahoochatsession.cpp yahooverifyaccount.cpp yahoowebcam.cpp
-kopete_yahoo_la_LDFLAGS     = -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kopete_yahoo_la_LDFLAGS     = -module $(KDE_PLUGIN) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_yahoo_la_LIBADD = ../../libkopete/avdevice/libkopete_videodevice.la \
 	$(top_builddir)/kopete/libkopete/libkopete.la ui/libkopeteyahooui.la libkyahoo/libkyahoo.la
 
diff --git a/kopete/protocols/yahoo/libkyahoo/Makefile.am b/kopete/protocols/yahoo/libkyahoo/Makefile.am
index 8524b4b1..e066486f 100644
--- a/kopete/protocols/yahoo/libkyahoo/Makefile.am
+++ b/kopete/protocols/yahoo/libkyahoo/Makefile.am
@@ -16,7 +16,7 @@ libkyahoo_la_SOURCES = client.cpp task.cpp connector.cpp inputprotocolbase.cpp \
 		yabentry.cpp modifyyabtask.cpp chatsessiontask.cpp sendfiletask.cpp filetransfernotifiertask.cpp \
 		receivefiletask.cpp yahoochattask.cpp
 libkyahoo_la_LDFLAGS = -no-undefined $(all_libraries)
-libkyahoo_la_LIBADD = $(LIB_QT)
+libkyahoo_la_LIBADD = $(LIB_TQT)
 
 noinst_HEADERS = logintask.h yabentry.h yabtask.h modifyyabtask.h \
 	chatsessiontask.h yahoochattask.h
diff --git a/kopete/protocols/yahoo/libkyahoo/tests/Makefile.am b/kopete/protocols/yahoo/libkyahoo/tests/Makefile.am
index 7f2d54a6..798dcaa2 100644
--- a/kopete/protocols/yahoo/libkyahoo/tests/Makefile.am
+++ b/kopete/protocols/yahoo/libkyahoo/tests/Makefile.am
@@ -3,7 +3,7 @@ METASOURCES = AUTO
 check_PROGRAMS = clientstream_test
 
 clientstream_test_SOURCES = clientstream_test.cpp
-clientstream_test_LDADD = $(LIB_QT) $(LIB_TDECORE) ../libkyahoo.la
+clientstream_test_LDADD = $(LIB_TQT) $(LIB_TDECORE) ../libkyahoo.la
 
 #login_test_SOURCES = logintest.cpp
-#login_test_LDADD = $(LIB_QT) $(LIB_TDECORE) ../libkyahoo.la
+#login_test_LDADD = $(LIB_TQT) $(LIB_TDECORE) ../libkyahoo.la
diff --git a/kpf/src/Makefile.am b/kpf/src/Makefile.am
index 6d4a01c2..126009df 100644
--- a/kpf/src/Makefile.am
+++ b/kpf/src/Makefile.am
@@ -37,7 +37,7 @@ kpf_panelapplet_la_SOURCES = \
   Defaults.cpp \
   Help.cpp
 
-kpf_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kpf_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 kpf_panelapplet_la_LIBADD = $(LIB_TDEIO) -ltdednssd
 
@@ -51,7 +51,7 @@ kpfpropertiesdialog_la_SOURCES = \
 
 kpfpropertiesdialog_la_LIBADD = $(LIB_TDEIO) -ltdednssd
 
-kpfpropertiesdialog_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kpfpropertiesdialog_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 noinst_HEADERS = \
   Utils.h \
diff --git a/kppp/Makefile.am b/kppp/Makefile.am
index 8519572c..8810aa48 100644
--- a/kppp/Makefile.am
+++ b/kppp/Makefile.am
@@ -51,7 +51,7 @@ kppp_SOURCES	= kpppwidget.cpp \
 		KPPPIface.skel
 
 # the library search path
-kppp_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_TDECORE) -lDCOP
+kppp_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) $(LIB_TDECORE) -lDCOP
 
 # the libraries to link against. Be aware of the order. First the libraries,
 # that depend on the following ones.
diff --git a/kppp/logview/Makefile.am b/kppp/logview/Makefile.am
index 13be319f..95060536 100644
--- a/kppp/logview/Makefile.am
+++ b/kppp/logview/Makefile.am
@@ -29,7 +29,7 @@ bin_PROGRAMS = 	kppplogview
 kppplogview_SOURCES =	main.cpp loginfo.cpp log.cpp monthly.cpp export.cpp
 
 # the library search path
-kppplogview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_TDECORE)
+kppplogview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) $(LIB_TDECORE)
 
 # the libraries to link against. Be aware of the order. First the libraries,
 # that depend on the following ones.
diff --git a/krdc/Makefile.am b/krdc/Makefile.am
index b62b1e03..59e6b4db 100644
--- a/krdc/Makefile.am
+++ b/krdc/Makefile.am
@@ -24,7 +24,7 @@ dnssddatadir = $(kde_datadir)/zeroconf
 dnssddata_DATA = _rfb._tcp
 
 krdc_LDADD   = vnc/libvnc.la rdp/librdp.la $(LIB_TDEUI) $(LIBXF86VIDMODE) $(LIB_SLP) $(LIB_TDEDNSSD) $(X_LDFLAGS) $(LIB_X11) -ltdewalletclient -lDCOP
-krdc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE)
+krdc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE)
 
 xdg_apps_DATA = krdc.desktop
 
diff --git a/krdc/rdp/Makefile.am b/krdc/rdp/Makefile.am
index 97535601..00161607 100644
--- a/krdc/rdp/Makefile.am
+++ b/krdc/rdp/Makefile.am
@@ -8,4 +8,4 @@ librdp_la_SOURCES = krdpview.cpp rdphostpref.cpp rdpprefs.ui
 
 noinst_HEADERS = krdpview.h rdphostpref.h
 librdp_la_LIBADD   = $(LIB_TDEUI) $(LIBJPEG)
-librdp_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+librdp_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
diff --git a/krfb/kcm_krfb/Makefile.am b/krfb/kcm_krfb/Makefile.am
index da5e50f1..82fdd7be 100644
--- a/krfb/kcm_krfb/Makefile.am
+++ b/krfb/kcm_krfb/Makefile.am
@@ -4,7 +4,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = kcm_krfb.la
 
 kcm_krfb_la_SOURCES = configurationwidget.ui kcm_krfb.cpp
-kcm_krfb_la_LDFLAGS  = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_krfb_la_LDFLAGS  = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kcm_krfb_la_LIBADD   = ../krfb/libkrfbconfig.la $(LIB_TDEUI) -ltdeio
 
 # Services
diff --git a/krfb/krfb/Makefile.am b/krfb/krfb/Makefile.am
index 68b163f9..9c8fcf21 100644
--- a/krfb/krfb/Makefile.am
+++ b/krfb/krfb/Makefile.am
@@ -13,7 +13,7 @@ krfb_SOURCES = rfbcontroller.cc xupdatescanner.cc main.cpp \
                connectionwidget.ui krfbifaceimpl.cc krfbiface.skel \
                trayicon.cpp connectiondialog.cc
 krfb_LDADD   = libkrfbconfig.la ../libvncserver/libvncserver.la ../srvloc/libsrvloc.la -lXtst $(LIB_TDEUI) $(LIBJPEG) -ltdeio -lDCOP
-krfb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) -ltdefx
+krfb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) -ltdefx
 
 appdatadir = $(kde_datadir)/krfb/pics
 appdata_DATA = eyes-open24.png eyes-closed24.png connection-side-image.png
diff --git a/krfb/srvloc/Makefile.am b/krfb/srvloc/Makefile.am
index 14d2a49b..751f2f12 100644
--- a/krfb/srvloc/Makefile.am
+++ b/krfb/srvloc/Makefile.am
@@ -7,7 +7,7 @@ libsrvloc_la_SOURCES = kserviceregistry.cpp uuid.cpp \
         kinetinterface.cpp kinetinterfacewatcher.cpp \
         getifaddrs.cpp
 
-libsrvloc_la_LIBADD   = $(LIB_QT) $(LIB_TDECORE) $(LIB_SLP)
+libsrvloc_la_LIBADD   = $(LIB_TQT) $(LIB_TDECORE) $(LIB_SLP)
 libsrvloc_la_LDFLAGS  = $(all_libraries) -no-undefined 
 noinst_HEADERS = kserviceregistry.h uuid.h \
                  getifaddrs.h kinetinterface.h kinetinterfacewatcher.h
diff --git a/ksirc/KSTicker/Makefile.am b/ksirc/KSTicker/Makefile.am
index 70cb5d5f..8f2478e4 100644
--- a/ksirc/KSTicker/Makefile.am
+++ b/ksirc/KSTicker/Makefile.am
@@ -15,6 +15,6 @@ check_PROGRAMS = ksttest
 
 ksttest_SOURCES = ksttest.cpp
 ksttest_LDADD = libksticker.la ../ksopts.lo ../nickColourMaker.lo $(LIB_TDEUI) 
-ksttest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+ksttest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 
diff --git a/ksirc/Makefile.am b/ksirc/Makefile.am
index 1eae87c6..1396d9bc 100644
--- a/ksirc/Makefile.am
+++ b/ksirc/Makefile.am
@@ -13,11 +13,11 @@ check_PROGRAMS = testview dccMgrTest
 
 testview_SOURCES = kstextviewtest.cpp
 testview_LDADD = kstextview.lo dccNew.lo dccNewbase.lo alistbox.lo objFinder.lo ksopts.lo nickColourMaker.lo $(LIB_TDEUTILS) $(LIB_TDEUI)
-testview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 dccMgrTest_SOURCES = dccMgrTest.cpp
 dccMgrTest_LDADD = dccManager.lo dccManagerbase.lo dccNew.lo dccNewbase.lo alistbox.lo objFinder.lo ksopts.lo nickColourMaker.lo $(LIB_TDEUTILS) $(LIB_TDEUI)
-dccMgrTest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+dccMgrTest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 bin_PROGRAMS =
 lib_LTLIBRARIES =
diff --git a/ktalkd/kcmktalkd/Makefile.am b/ktalkd/kcmktalkd/Makefile.am
index 5809fdcd..88707ff9 100644
--- a/ktalkd/kcmktalkd/Makefile.am
+++ b/ktalkd/kcmktalkd/Makefile.am
@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kcm_ktalkd.la
 
 kcm_ktalkd_la_SOURCES = main.cpp soundpage.cpp answmachpage.cpp \
 	forwmachpage.cpp
-kcm_ktalkd_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_ktalkd_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kcm_ktalkd_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO)
 
 #for extra warnings during compilation :
diff --git a/ktalkd/ktalkd/Makefile.am b/ktalkd/ktalkd/Makefile.am
index aa27a3d4..53396c79 100644
--- a/ktalkd/ktalkd/Makefile.am
+++ b/ktalkd/ktalkd/Makefile.am
@@ -20,7 +20,7 @@ AM_CPPFLAGS	=      -DHAVE_KDE
 ktalkd_SOURCES	=	print.c repairs.c \
 	announce.cpp process.cpp readcfg++.cpp table.cpp talkd.cpp \
 	find_user.cpp threads.cpp options.cpp unixsock.cpp
-ktalkd_LDFLAGS	=       $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE)
+ktalkd_LDFLAGS	=       $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE)
 ktalkd_LDADD	=       machines/libmach.a $(LIBBSD) $(LIB_TDECORE) $(LIBSOCKET) -lDCOP
 
 ###########################################################
diff --git a/ktalkd/ktalkdlg/Makefile.am b/ktalkd/ktalkdlg/Makefile.am
index 667dae37..4c7acad6 100644
--- a/ktalkd/ktalkdlg/Makefile.am
+++ b/ktalkd/ktalkdlg/Makefile.am
@@ -7,7 +7,7 @@ bin_PROGRAMS	 =	ktalkdlg
 ktalkdlg_SOURCES =	ktalkdlg.cpp
 
 INCLUDES	=	$(all_includes)
-ktalkdlg_LDFLAGS=	$(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE)
+ktalkdlg_LDFLAGS=	$(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE)
 ktalkdlg_LDADD	=	$(LIB_TDEUI) -lDCOP
 
 #for extra warnings during compilation :
diff --git a/lanbrowsing/kcmlisa/Makefile.am b/lanbrowsing/kcmlisa/Makefile.am
index 6bf80dae..344a5e7a 100644
--- a/lanbrowsing/kcmlisa/Makefile.am
+++ b/lanbrowsing/kcmlisa/Makefile.am
@@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = kcm_lanbrowser.la
 
 kcm_lanbrowser_la_SOURCES = main.cpp setupwizard.cpp kcmlisa.cpp kcmreslisa.cpp kcmtdeiolan.cpp portsettingsbar.cpp findnic.cpp
 
-kcm_lanbrowser_la_LDFLAGS  = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_lanbrowser_la_LDFLAGS  = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kcm_lanbrowser_la_LIBADD = -ltdeui
 
 INCLUDES= $(all_includes)
diff --git a/tdednssd/ioslave/Makefile.am b/tdednssd/ioslave/Makefile.am
index 13932724..b17beac7 100644
--- a/tdednssd/ioslave/Makefile.am
+++ b/tdednssd/ioslave/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = tdeio_zeroconf.la
 
 tdeio_zeroconf_la_SOURCES = dnssd.cpp
 tdeio_zeroconf_la_LIBADD = $(LIB_TDEDNSSD) $(LIB_TDEIO)
-tdeio_zeroconf_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdeio_zeroconf_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_PLUGIN) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 protocol_DATA = zeroconf.protocol invitation.protocol
 protocoldir = $(kde_servicesdir)
diff --git a/tdefile-plugins/torrent/Makefile.am b/tdefile-plugins/torrent/Makefile.am
index b500d38b..3164c69a 100644
--- a/tdefile-plugins/torrent/Makefile.am
+++ b/tdefile-plugins/torrent/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS   = tdefile_torrent.h bbase.h bdict.h bytetape.h \
 kde_module_LTLIBRARIES = tdefile_torrent.la
 
 tdefile_torrent_la_SOURCES = bytetape.cpp bint.cpp bstring.cpp blist.cpp bdict.cpp tdefile_torrent.cpp
-tdefile_torrent_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdefile_torrent_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 tdefile_torrent_la_LIBADD = $(LIB_TDEIO)
 
 # let automoc handle all of the meta source files (moc)
diff --git a/wifi/Makefile.am b/wifi/Makefile.am
index 1cbd9763..dcbd8dcb 100644
--- a/wifi/Makefile.am
+++ b/wifi/Makefile.am
@@ -27,7 +27,7 @@ if include_ARTS
 ARTS_LIBS = -lartsflow -lmcop -lartsflow_idl
 endif
 
-kwifimanager_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(ARTS_LIBS)
+kwifimanager_LDFLAGS = $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(ARTS_LIBS)
 kwifimanager_LDADD = $(ARTS_LIBS) -liw $(LIB_TDEUI)
 
 noinst_HEADERS = 	interface_wireless.h \