LIB_QT -> LIB_TQT conversion to align to updated admin module

Signed-off-by: Michele Calgaro <[email protected]>

56 files changed, 67 insertions, 67 deletions

diff --git a/drkonqi/Makefile.am b/drkonqi/Makefile.am
index a2d43c35c..61b249874 100644
--- a/drkonqi/Makefile.am
+++ b/drkonqi/Makefile.am
@@ -11,7 +11,7 @@ EXTRA_DIST = LICENSE
 bin_PROGRAMS = drkonqi crashtest
 
 # Libraries:
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 LDADD  = $(LIB_TDEUI) $(LIB_TDEIO)
 
 # toplevel.cpp must be last in row due to X-headers being included. (--enable-final)
diff --git a/kappfinder/Makefile.am b/kappfinder/Makefile.am
index 07a6a7423..fb68e6e85 100644
--- a/kappfinder/Makefile.am
+++ b/kappfinder/Makefile.am
@@ -3,12 +3,12 @@ SUBDIRS = apps
 bin_PROGRAMS = kappfinder
 kappfinder_SOURCES = main.cpp toplevel.cpp common.cpp
 kappfinder_LDADD = $(LIB_TDEUI) $(LIB_TDEIO)
-kappfinder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kappfinder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 noinst_PROGRAMS = kappfinder_install
 kappfinder_install_SOURCES = main_install.cpp common.cpp
 kappfinder_install_LDADD = $(LIB_TDEUI)
-kappfinder_install_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kappfinder_install_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 INCLUDES = $(all_includes)
 METASOURCES = AUTO
diff --git a/kate/interfaces/Makefile.am b/kate/interfaces/Makefile.am
index 57901370b..1a6edf3bf 100644
--- a/kate/interfaces/Makefile.am
+++ b/kate/interfaces/Makefile.am
@@ -6,7 +6,7 @@ libkateinterfacesprivate_la_SOURCES = application.cpp mainwindow.cpp documentman
                                         pluginmanager.cpp plugin.cpp pluginconfiginterface.cpp pluginconfiginterfaceextension.cpp
 
 libkateinterfacesprivate_la_LIBADD   = -lkatepartinterfaces
-libkateinterfacesprivate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+libkateinterfacesprivate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 kateinclude_HEADERS = application.h documentmanager.h mainwindow.h plugin.h viewmanager.h pluginconfiginterface.h pluginconfiginterfaceextension.h toolviewmanager.h pluginmanager.h
 kateincludedir = $(includedir)/kate
diff --git a/kcontrol/filetypes/Makefile.am b/kcontrol/filetypes/Makefile.am
index d69f552f4..495e39ce7 100644
--- a/kcontrol/filetypes/Makefile.am
+++ b/kcontrol/filetypes/Makefile.am
@@ -21,7 +21,7 @@ libfiletypes_la_SOURCES = filetypesview.cpp filetypedetails.cpp filegroupdetails
 
 keditfiletype_SOURCES = keditfiletype.cpp
 keditfiletype_LDADD = libfiletypes.la $(LIB_TDEIO)
-keditfiletype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+keditfiletype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 messages:
 	$(XGETTEXT) *.cpp -o $(podir)/filetypes.pot
diff --git a/kcontrol/input/Makefile.am b/kcontrol/input/Makefile.am
index ec7a4ad8c..8a8910950 100644
--- a/kcontrol/input/Makefile.am
+++ b/kcontrol/input/Makefile.am
@@ -16,7 +16,7 @@ bin_PROGRAMS = kapplymousetheme
 
 kapplymousetheme_SOURCES = kapplymousetheme.cpp
 kapplymousetheme_LDFLAGS = $(all_libraries)
-kapplymousetheme_LDADD = $(LIB_XCURSOR) $(LIB_X11) $(LIB_QT)
+kapplymousetheme_LDADD = $(LIB_XCURSOR) $(LIB_X11) $(LIB_TQT)
 
 kde_module_LTLIBRARIES = kcm_input.la
 
diff --git a/kcontrol/tdefontinst/viewpart/Makefile.am b/kcontrol/tdefontinst/viewpart/Makefile.am
index c088942da..c6c08dd9b 100644
--- a/kcontrol/tdefontinst/viewpart/Makefile.am
+++ b/kcontrol/tdefontinst/viewpart/Makefile.am
@@ -17,7 +17,7 @@ AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFR
 METASOURCES = AUTO
 
 tdefontview_LDADD = $(LIB_TDEPARTS)
-tdefontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdefontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 bin_PROGRAMS = tdefontview
 xdg_apps_DATA = tdefontview.desktop
diff --git a/kdcop/Makefile.am b/kdcop/Makefile.am
index 25c33f654..110119911 100644
--- a/kdcop/Makefile.am
+++ b/kdcop/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES = $(all_includes)
 bin_PROGRAMS = kdcop
 
 kdcop_SOURCES = kdcop.cpp kdcopwindow.cpp kdcoplistview.cpp kdcopview.ui
-kdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) -lDCOP $(LIB_QT)
+kdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) -lDCOP $(LIB_TQT)
 
 noinst_HEADERS = kdcopwindow.h
 METASOURCES =	AUTO
diff --git a/kdesktop/Makefile.am b/kdesktop/Makefile.am
index 539db39f1..5da121d19 100644
--- a/kdesktop/Makefile.am
+++ b/kdesktop/Makefile.am
@@ -35,7 +35,7 @@ noinst_HEADERS = desktop.h bgmanager.h krootwm.h \
 
 kcheckrunning_SOURCES = kcheckrunning.cpp
 kcheckrunning_LDFLAGS = $(all_libraries)
-kcheckrunning_LDADD = $(LIB_X11) $(LIB_QT)
+kcheckrunning_LDADD = $(LIB_X11) $(LIB_TQT)
 
 kxdglauncher_SOURCES = kxdglauncher.cpp
 kxdglauncher_LDFLAGS = $(all_libraries)
diff --git a/kdesktop/kwebdesktop/Makefile.am b/kdesktop/kwebdesktop/Makefile.am
index 0d627675f..cd4458b1a 100644
--- a/kdesktop/kwebdesktop/Makefile.am
+++ b/kdesktop/kwebdesktop/Makefile.am
@@ -7,7 +7,7 @@ bin_PROGRAMS = 	kwebdesktop
 METASOURCES = AUTO
 
 kwebdesktop_SOURCES = kwebdesktop.cpp kwebdesktopsettings.kcfgc 
-kwebdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kwebdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 kdesktop_kwebdesktop_data_DATA = kwebdesktop.desktop
 kdesktop_kwebdesktop_datadir = $(kde_datadir)/kdesktop/programs
diff --git a/kdesktop/lock/Makefile.am b/kdesktop/lock/Makefile.am
index 7713707e9..c686e3ea9 100644
--- a/kdesktop/lock/Makefile.am
+++ b/kdesktop/lock/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am of tdebase/kdesktop/lock
 
 INCLUDES = -I.. -I$(top_srcdir)/kcheckpass -I$(top_srcdir)/tdmlib $(GLINC) $(all_includes)
-kdesktop_lock_LDFLAGS  = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kdesktop_lock_LDFLAGS  = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kdesktop_lock_LDADD    = ../libkdesktopsettings.la ../../tdmlib/libdmctl.la $(LIB_TDEIO) $(LIB_XF86MISC) $(GLLIB)
 
 ####### Files
diff --git a/kdialog/Makefile.am b/kdialog/Makefile.am
index 05f22af35..cec3c6003 100644
--- a/kdialog/Makefile.am
+++ b/kdialog/Makefile.am
@@ -5,7 +5,7 @@ bin_PROGRAMS = kdialog
 
 kdialog_SOURCES = kdialog.cpp widgets.cpp tdelistboxdialog.cpp progressdialog.cpp progressdialogiface.skel
 kdialog_LDADD = $(LIB_TDEIO)
-kdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 METASOURCES = AUTO
 
diff --git a/kfind/Makefile.am b/kfind/Makefile.am
index 96b033088..2cffe23bf 100644
--- a/kfind/Makefile.am
+++ b/kfind/Makefile.am
@@ -33,4 +33,4 @@ kfind_SOURCES = kfwin.cpp kfinddlg.cpp main.cpp
 kfind_LDADD   =  libkfind_common.la $(LIB_TDEPARTS)
 
 # the library search path.
-kfind_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kfind_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
diff --git a/khelpcenter/Makefile.am b/khelpcenter/Makefile.am
index e9e3ac015..16ea5885e 100644
--- a/khelpcenter/Makefile.am
+++ b/khelpcenter/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES = AUTO
 bin_PROGRAMS = khc_indexbuilder
 lib_LTLIBRARIES = 
 
-khc_indexbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+khc_indexbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 khc_indexbuilder_LDADD = $(LIB_TDECORE)
 khc_indexbuilder_SOURCES = khc_indexbuilder.cpp
 
@@ -34,7 +34,7 @@ khelpcenter_la_SOURCES = navigator.cpp \
 
 EXTRA_PROGRAMS = testmetainfo
 
-testmetainfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testmetainfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 testmetainfo_LDADD = $(LIB_TDECORE) docentry.lo docmetainfo.lo \
                      docentrytraverser.lo htmlsearch.lo
 testmetainfo_SOURCES = testmetainfo.cpp
diff --git a/khelpcenter/htmlsearch/Makefile.am b/khelpcenter/htmlsearch/Makefile.am
index d4d00fb5f..3c06f5e67 100644
--- a/khelpcenter/htmlsearch/Makefile.am
+++ b/khelpcenter/htmlsearch/Makefile.am
@@ -27,7 +27,7 @@ wrapperdir = $(kde_datadir)/khelpcenter/
 wrapper_SCRIPTS = meinproc_wrapper
 
 tdehtmlindex_SOURCES = index.cpp
-tdehtmlindex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdehtmlindex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 tdehtmlindex_LDADD = libhtmlsearch.la $(LIB_TDEUI)
 
 xpm_DATA = unchecked.xpm checked.xpm
diff --git a/kicker/extensions/kasbar/Makefile.am b/kicker/extensions/kasbar/Makefile.am
index a0d79970f..7facc0c27 100644
--- a/kicker/extensions/kasbar/Makefile.am
+++ b/kicker/extensions/kasbar/Makefile.am
@@ -37,9 +37,9 @@ EXTRA_DIST = $(lnk_DATA)
 
 bin_PROGRAMS = kasbar
 kasbar_SOURCES = kasbarapp.cpp
-kasbar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kasbar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kasbar_LDADD = 	libkasbar.la \
-		$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
+		$(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI)
 
 
 messages:
diff --git a/kicker/kicker/Makefile.am b/kicker/kicker/Makefile.am
index 294c323bf..15951fce8 100644
--- a/kicker/kicker/Makefile.am
+++ b/kicker/kicker/Makefile.am
@@ -32,7 +32,7 @@ tdeconf_PROGRAMS = kicker-3.4-reverseLayout
 tdeconfdir = $(libdir)/tdeconf_update_bin
 
 kicker_3_4_reverseLayout_SOURCES = kicker-3.4-reverseLayout.cpp
-kicker_3_4_reverseLayout_LDADD   = $(LIB_QT) $(LIB_TDECORE)
+kicker_3_4_reverseLayout_LDADD   = $(LIB_TQT) $(LIB_TDECORE)
 kicker_3_4_reverseLayout_LDFLAGS = $(all_libraries)
 
 updatedir = $(kde_datadir)/tdeconf_update
diff --git a/kicker/proxy/Makefile.am b/kicker/proxy/Makefile.am
index 0ed35216d..bbf3a67be 100644
--- a/kicker/proxy/Makefile.am
+++ b/kicker/proxy/Makefile.am
@@ -17,7 +17,7 @@ extensionproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
 
 extensiondebugger_SOURCES = extensiondebugger.cpp
 extensiondebugger_LDADD = ../libkicker/libkickermain.la
-extensiondebugger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+extensiondebugger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 messages:
 	$(XGETTEXT) appletproxy.cpp -o $(podir)/appletproxy.pot
diff --git a/knetattach/Makefile.am b/knetattach/Makefile.am
index 966c91e20..c1b2d4fdb 100644
--- a/knetattach/Makefile.am
+++ b/knetattach/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES= $(all_includes)
 
 bin_PROGRAMS = knetattach
 knetattach_SOURCES = knetattach.ui main.cpp
-knetattach_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+knetattach_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 knetattach_LDADD   = $(LIB_TDEIO)
 METASOURCES = AUTO
 xdg_apps_DATA = knetattach.desktop
diff --git a/konqueror/keditbookmarks/Makefile.am b/konqueror/keditbookmarks/Makefile.am
index a062b868f..5bc230b53 100644
--- a/konqueror/keditbookmarks/Makefile.am
+++ b/konqueror/keditbookmarks/Makefile.am
@@ -7,7 +7,7 @@ lib_LTLIBRARIES =
 tdeinit_LTLIBRARIES = keditbookmarks.la
 
 kbookmarkmerger_SOURCES = kbookmarkmerger.cpp
-kbookmarkmerger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kbookmarkmerger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kbookmarkmerger_LDADD = $(LIB_TDEIO)
 
 dcop_DCOPIDLNG = true
diff --git a/konsole/konsole/Makefile.am b/konsole/konsole/Makefile.am
index 70b1b0ba5..d3b60b89a 100644
--- a/konsole/konsole/Makefile.am
+++ b/konsole/konsole/Makefile.am
@@ -29,7 +29,7 @@ libkonsolepart_la_LIBADD = $(XTESTLIB) $(LIB_TDEPARTS)
 
 fontembedder_SOURCES = fontembedder.cpp
 fontembedder_LDFLAGS = $(all_libraries)
-fontembedder_LDADD = $(LIB_QT)
+fontembedder_LDADD = $(LIB_TQT)
 
 # kwrited kded module
 kded_kwrited_la_SOURCES = kwrited.cpp TEPty.cpp kwrited.skel
@@ -46,7 +46,7 @@ konsole_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPRINT) $(LIBUTIL) $(XTEST
 
 # kcmkonsole_SOURCES = kcmkonsole.cpp schema.cpp
 # kcmkonsole_LDADD   = $(LIB_TDEUI)
-# kcmkonsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+# kcmkonsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 noinst_HEADERS = TEWidget.h TEPty.h TEmulation.h TEmuVt102.h \
 	TECommon.h TEScreen.h konsole.h schema.h session.h konsole_wcwidth.h \
diff --git a/kpager/Makefile.am b/kpager/Makefile.am
index dd72707fc..cad09d50c 100644
--- a/kpager/Makefile.am
+++ b/kpager/Makefile.am
@@ -6,7 +6,7 @@ kpager_SOURCES = desktop.cpp kpager.cpp config.cpp windowdrag.cpp \
 	kpagerIface.skel main.cpp  
 
 kpager_METASOURCES = AUTO
-kpager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kpager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 kpager_LDADD = $(LIB_TDEUI)
 
diff --git a/kpersonalizer/Makefile.am b/kpersonalizer/Makefile.am
index 304d5503b..fb13dc1b5 100644
--- a/kpersonalizer/Makefile.am
+++ b/kpersonalizer/Makefile.am
@@ -38,7 +38,7 @@ METASOURCES = AUTO
 
 KDE_ICON= AUTO
 # the library search path. 
-kpersonalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kpersonalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 # Uncomment the following two lines if you add a ui.rc file for your application to make use of
 # KDE�s XML GUI builing
diff --git a/kreadconfig/Makefile.am b/kreadconfig/Makefile.am
index 0a4e56935..542b6a142 100644
--- a/kreadconfig/Makefile.am
+++ b/kreadconfig/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = -DQT_NO_CAST_ASCII 
 
 INCLUDES = $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 LDADD   =       $(LIB_TDECORE)
 
 bin_PROGRAMS	= kreadconfig kwriteconfig
diff --git a/ksmserver/Makefile.am b/ksmserver/Makefile.am
index e18adec94..8f1a236e4 100644
--- a/ksmserver/Makefile.am
+++ b/ksmserver/Makefile.am
@@ -43,7 +43,7 @@ updatedir = $(kde_datadir)/tdeconf_update
 
 EXTRA_PROGRAMS = testsh
 testsh_SOURCES = test.cpp timed.ui
-testsh_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testsh_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 testsh_LDADD = $(LIB_TDEUI) shutdowndlg.lo ../tdmlib/libdmctl.la $(HAL_LIBS) $(DBUS_LIBS)
 
 messages:
diff --git a/ksplashml/Makefile.am b/ksplashml/Makefile.am
index 1313d7acc..2c0b76af4 100644
--- a/ksplashml/Makefile.am
+++ b/ksplashml/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES=AUTO
 
 bin_PROGRAMS = ksplash
 ksplash_SOURCES = wndmain.cpp ksplashiface.skel main.cpp
-ksplash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+ksplash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 ksplash_LDADD = $(LIB_TDEUI) themeengine/default/libthemedefault.la themeengine/libksplashthemes.la $(LIB_TDEIO)
 
 noinst_HEADERS = ksplashiface.h wndmain.h
diff --git a/ksplashml/themeengine/default/Makefile.am b/ksplashml/themeengine/default/Makefile.am
index b117cbb29..20e1eb472 100644
--- a/ksplashml/themeengine/default/Makefile.am
+++ b/ksplashml/themeengine/default/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES =  -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes)
 
 noinst_LTLIBRARIES = libthemedefault.la
 libthemedefault_la_SOURCES = themelegacy.cpp
-libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 libthemedefault_la_LIBADD = $(LIB_TDEUI) ../libksplashthemes.la
 
 kde_module_LTLIBRARIES = ksplashdefault.la
diff --git a/ksplashml/themeengine/simple/Makefile.am b/ksplashml/themeengine/simple/Makefile.am
index bed3bd5d1..71613e33d 100644
--- a/ksplashml/themeengine/simple/Makefile.am
+++ b/ksplashml/themeengine/simple/Makefile.am
@@ -3,5 +3,5 @@ INCLUDES = $(all_includes)
 
 bin_PROGRAMS = ksplashsimple
 ksplashsimple_SOURCES = main.cpp
-ksplashsimple_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-ksplashsimple_LDADD = $(LIB_XINERAMA) $(LIB_X11) $(LIB_QT)
+ksplashsimple_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+ksplashsimple_LDADD = $(LIB_XINERAMA) $(LIB_X11) $(LIB_TQT)
diff --git a/ksplashml/themeengine/standard/Makefile.am b/ksplashml/themeengine/standard/Makefile.am
index efd1fbeb1..e78c4555f 100644
--- a/ksplashml/themeengine/standard/Makefile.am
+++ b/ksplashml/themeengine/standard/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES =  -I$(top_srcdir)/ksplashml/themeengine $(all_includes)
 
 noinst_LTLIBRARIES = libthemestandard.la
 libthemestandard_la_SOURCES = themestandard.cpp wndicon.cpp wndstatus.cpp
-libthemestandard_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+libthemestandard_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 libthemestandard_la_LIBADD = $(LIB_TDEUI) ../libksplashthemes.la
 
 kde_module_LTLIBRARIES = ksplashstandard.la
diff --git a/ksplashml/themeengine/unified/Makefile.am b/ksplashml/themeengine/unified/Makefile.am
index b117cbb29..20e1eb472 100644
--- a/ksplashml/themeengine/unified/Makefile.am
+++ b/ksplashml/themeengine/unified/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES =  -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes)
 
 noinst_LTLIBRARIES = libthemedefault.la
 libthemedefault_la_SOURCES = themelegacy.cpp
-libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 libthemedefault_la_LIBADD = $(LIB_TDEUI) ../libksplashthemes.la
 
 kde_module_LTLIBRARIES = ksplashdefault.la
diff --git a/kstart/Makefile.am b/kstart/Makefile.am
index 3165a3bed..ab983d6dd 100644
--- a/kstart/Makefile.am
+++ b/kstart/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = $(all_includes)
 
 bin_PROGRAMS	= kstart
 kstart_SOURCES	= kstart.cpp
-kstart_LDFLAGS  = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kstart_LDFLAGS  = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kstart_LDADD    = $(LIB_TDECORE)
 METASOURCES =	kstart.moc 
 
diff --git a/ksysguard/gui/Makefile.am b/ksysguard/gui/Makefile.am
index 69066d230..3259e44f4 100644
--- a/ksysguard/gui/Makefile.am
+++ b/ksysguard/gui/Makefile.am
@@ -32,7 +32,7 @@ ksysguard_LDADD = \
 	ksgrd/libksgrd.la \
 	SensorDisplayLib/libsensordisplays.la \
 	$(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEDNSSD)
-ksysguard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+ksysguard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 kpm_SOURCES = kpm.c
 
diff --git a/ksystraycmd/Makefile.am b/ksystraycmd/Makefile.am
index 897fcc81d..dd90528fe 100644
--- a/ksystraycmd/Makefile.am
+++ b/ksystraycmd/Makefile.am
@@ -10,7 +10,7 @@ METASOURCES	= ksystraycmd.moc
 noinst_HEADERS  = ksystraycmd.h
 
 ksystraycmd_SOURCES = ksystraycmd.cpp main.cpp
-ksystraycmd_LDFLAGS  = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+ksystraycmd_LDFLAGS  = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 messages:
 	$(XGETTEXT) $(ksystraycmd_SOURCES) -o $(podir)/ksystraycmd.pot
diff --git a/ktip/Makefile.am b/ktip/Makefile.am
index 6bcd39991..d92c154b6 100644
--- a/ktip/Makefile.am
+++ b/ktip/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = pics
 bin_PROGRAMS = ktip
 ktip_SOURCES = ktipwindow.cpp
 ktip_LDADD = $(LIB_TDEUI)
-ktip_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+ktip_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 METASOURCES = AUTO
 KDE_ICON = AUTO
diff --git a/nsplugins/test/Makefile.am b/nsplugins/test/Makefile.am
index af17ade48..947d5e80e 100644
--- a/nsplugins/test/Makefile.am
+++ b/nsplugins/test/Makefile.am
@@ -4,7 +4,7 @@ noinst_HEADERS = testnsplugin.h
 
 check_PROGRAMS = testnsplugin
 testnsplugin_SOURCES = testnsplugin.cpp
-testnsplugin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testnsplugin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 testnsplugin_LDADD = $(LIB_TDEUI) ../libnsplugin.la
 
 $(srcdir)/testnsplugin.cpp: ../NSPluginClassIface_stub.h
diff --git a/tdeioslave/about/Makefile.am b/tdeioslave/about/Makefile.am
index 9fca3428a..7c3b44694 100644
--- a/tdeioslave/about/Makefile.am
+++ b/tdeioslave/about/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am of tdebase/tdeioslave/about
 
 INCLUDES= $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 ####### Files
 
diff --git a/tdeioslave/finger/Makefile.am b/tdeioslave/finger/Makefile.am
index c5b95f2d0..53ff2b11d 100644
--- a/tdeioslave/finger/Makefile.am
+++ b/tdeioslave/finger/Makefile.am
@@ -2,7 +2,7 @@
 ## Edit from Makefile.am of tdebase/tdeioslave/man
 
 INCLUDES= $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 ####### Files
 
diff --git a/tdeioslave/fish/Makefile.am b/tdeioslave/fish/Makefile.am
index 3c79a3d3e..c631e3306 100644
--- a/tdeioslave/fish/Makefile.am
+++ b/tdeioslave/fish/Makefile.am
@@ -1,7 +1,7 @@
 kde_module_LTLIBRARIES = tdeio_fish.la
 
 INCLUDES = $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 tdeio_fish_la_SOURCES = fish.cpp
 tdeio_fish_la_LIBADD = $(LIB_TDESYCOCA) $(LIBUTIL) 
diff --git a/tdeioslave/mac/Makefile.am b/tdeioslave/mac/Makefile.am
index 9d9267055..888d31ccf 100644
--- a/tdeioslave/mac/Makefile.am
+++ b/tdeioslave/mac/Makefile.am
@@ -1,7 +1,7 @@
 ## Makfile.am for tdeio_mac
 
 INCLUDES= $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 ####### Files
 
diff --git a/tdeioslave/man/Makefile.am b/tdeioslave/man/Makefile.am
index e1dd3c867..b3f80c882 100644
--- a/tdeioslave/man/Makefile.am
+++ b/tdeioslave/man/Makefile.am
@@ -1,15 +1,15 @@
 ## Makefile.am of tdebase/tdeioslave/man
 
 INCLUDES= $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 EXTRA_PROGRAMS = tdeio_man_test man2html
 
 ####### just for testing ([email protected], 15.02.2001)
 
 tdeio_man_test_SOURCES = tdeio_man_test.cpp
-tdeio_man_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-tdeio_man_test_LDADD = man2html.lo tdeio_man.lo $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+tdeio_man_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdeio_man_test_LDADD = man2html.lo tdeio_man.lo $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)
 
 ####### Files
 
@@ -38,8 +38,8 @@ messages:
 	$(XGETTEXT) *.cpp *.h -o $(podir)/tdeio_man.pot
 
 man2html_SOURCES = dummy.cpp
-man2html_LDADD = man2html_simple.o $(LIB_QT)
-man2html_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+man2html_LDADD = man2html_simple.o $(LIB_TQT)
+man2html_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 dummy.cpp:
 	echo > $@
diff --git a/tdeioslave/media/mounthelper/Makefile.am b/tdeioslave/media/mounthelper/Makefile.am
index b541ecb69..ce226f728 100644
--- a/tdeioslave/media/mounthelper/Makefile.am
+++ b/tdeioslave/media/mounthelper/Makefile.am
@@ -5,7 +5,7 @@ AM_LDFLAGS = $(all_libraries)
 
 tdeio_media_mounthelper_SOURCES = tdeio_media_mounthelper.cpp decryptdialog.ui dialog.cpp
 
-tdeio_media_mounthelper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdeio_media_mounthelper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 tdeio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_TDEIO) $(LIB_TDEUI)
 
 METASOURCES = AUTO
diff --git a/tdeioslave/nfs/Makefile.am b/tdeioslave/nfs/Makefile.am
index bda4479de..29f522f6c 100644
--- a/tdeioslave/nfs/Makefile.am
+++ b/tdeioslave/nfs/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am of tdebase/tdeioslave/man
 
 INCLUDES= $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 ####### Files
 
diff --git a/tdeioslave/sftp/Makefile.am b/tdeioslave/sftp/Makefile.am
index 2d2079e09..512f5f7dd 100644
--- a/tdeioslave/sftp/Makefile.am
+++ b/tdeioslave/sftp/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am of tdebase/tdeioslave/sftp
 
 INCLUDES = $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 METASOURCES = AUTO
 
 ####### Files
diff --git a/tdeioslave/smtp/Makefile.am b/tdeioslave/smtp/Makefile.am
index 5d0ad64c0..9859048b1 100644
--- a/tdeioslave/smtp/Makefile.am
+++ b/tdeioslave/smtp/Makefile.am
@@ -29,7 +29,7 @@ test_commands_LDADD =  $(tdeio_smtp_la_LIBADD)
 test_commands_LDFLAGS = $(all_libraries)
 
 interactivesmtpserver_SOURCES = interactivesmtpserver.cc
-interactivesmtpserver_LDADD = $(LIB_QT)
+interactivesmtpserver_LDADD = $(LIB_TQT)
 interactivesmtpserver_LDFLAGS = $(all_libraries)
 interactivesmtpserver_METASOURCES = AUTO
 
diff --git a/tdeioslave/tar/Makefile.am b/tdeioslave/tar/Makefile.am
index 1388d640d..98acbb726 100644
--- a/tdeioslave/tar/Makefile.am
+++ b/tdeioslave/tar/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am of tdebase/tdeioslave/tar
 
 INCLUDES = $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 METASOURCES = AUTO
 
 kde_module_LTLIBRARIES = tdeio_tar.la
diff --git a/tdeioslave/thumbnail/Makefile.am b/tdeioslave/thumbnail/Makefile.am
index 91355023d..c64a716ed 100644
--- a/tdeioslave/thumbnail/Makefile.am
+++ b/tdeioslave/thumbnail/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am of tdebase/tdeioslave/thumbnail
 
 INCLUDES = $(all_includes) $(EXR_FLAGS)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 METASOURCES = AUTO
 
 if have_xcursor
diff --git a/tdeioslave/trash/Makefile.am b/tdeioslave/trash/Makefile.am
index ee27b3d2a..170701c3f 100644
--- a/tdeioslave/trash/Makefile.am
+++ b/tdeioslave/trash/Makefile.am
@@ -12,7 +12,7 @@ tdeio_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
 bin_PROGRAMS = ktrash
 ktrash_SOURCES = ktrash.cpp
 ktrash_LDADD = $(LIB_TDEIO)
-ktrash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+ktrash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 kde_services_DATA = trash.protocol
 
diff --git a/tdepasswd/Makefile.am b/tdepasswd/Makefile.am
index 1675f9975..55cf59979 100644
--- a/tdepasswd/Makefile.am
+++ b/tdepasswd/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = kcm
 
 bin_PROGRAMS = tdepasswd
 tdepasswd_SOURCES = tdepasswd.cpp passwd.cpp passwddlg.cpp
-tdepasswd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdepasswd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 tdepasswd_LDADD = $(LIB_TDEIO)
 
 METASOURCES =  AUTO
diff --git a/tdeprint/descriptions/Makefile.am b/tdeprint/descriptions/Makefile.am
index 66b8205e6..d959aa4bd 100644
--- a/tdeprint/descriptions/Makefile.am
+++ b/tdeprint/descriptions/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = $(all_includes)
 EXTRA_PROGRAMS = sortthem
 
 sortthem_SOURCES = sortthem.cpp
-sortthem_LDFLAGS = $(all_libraries) $(LIB_QT)
+sortthem_LDFLAGS = $(all_libraries) $(LIB_TQT)
 
 printers.cpp: sortthem
 	: > printers.cpp
diff --git a/tdeprint/tdeprintfax/Makefile.am b/tdeprint/tdeprintfax/Makefile.am
index eb886bdfe..a11e69200 100644
--- a/tdeprint/tdeprintfax/Makefile.am
+++ b/tdeprint/tdeprintfax/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES= $(all_includes)
 bin_PROGRAMS = tdeprintfax
 tdeprintfax_SOURCES = main.cpp tdeprintfax.cpp faxab.cpp faxctrl.cpp confgeneral.cpp configdlg.cpp \
 		      conffax.cpp confsystem.cpp conffilters.cpp filterdlg.cpp defcmds.cpp
-tdeprintfax_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdeprintfax_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 tdeprintfax_LDADD   = $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPRINT) -ltdeabc
 tdeprintfax_METASOURCES = AUTO
 
diff --git a/tdescreensaver/Makefile.am b/tdescreensaver/Makefile.am
index fba437d8a..0fca3003e 100644
--- a/tdescreensaver/Makefile.am
+++ b/tdescreensaver/Makefile.am
@@ -4,7 +4,7 @@
 AM_CPPFLAGS = -UQT_NO_ASCII_CAST
 
 INCLUDES = $(GLINC) $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 bin_PROGRAMS = krandom.kss kblankscrn.kss
 
diff --git a/tdesu/tdesu/Makefile.am b/tdesu/tdesu/Makefile.am
index e4f66a3de..5e5e113fa 100644
--- a/tdesu/tdesu/Makefile.am
+++ b/tdesu/tdesu/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES= $(all_includes)
 ## tdesu
 bin_PROGRAMS = 	tdesu
 tdesu_SOURCES = tdesu.cpp sudlg.cpp
-tdesu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdesu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 tdesu_LDADD   = $(LIB_TDEIO) -ltdesu
 tdesu_METASOURCES =  AUTO
 noinst_HEADERS = sudlg.h
diff --git a/tdm/kfrontend/Makefile.am b/tdm/kfrontend/Makefile.am
index dfbfb8a05..6a72d1287 100644
--- a/tdm/kfrontend/Makefile.am
+++ b/tdm/kfrontend/Makefile.am
@@ -24,11 +24,11 @@ tdm_greet_SOURCES = \
     tdmadmindialog.cpp \
     kgreeter.cpp \
     kgapp.cpp
-tdm_greet_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdm_greet_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 tdm_greet_LDADD = themer/libtdmthemer.a $(LIB_TDEUI) $(XTESTLIB) $(LIBPOSIX4)
 
 krootimage_SOURCES = krootimage.cpp
-krootimage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+krootimage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 krootimage_LDADD = $(top_builddir)/kcontrol/background/libbgnd.la $(LIB_TDEIO)
 
 METASOURCES = AUTO
diff --git a/twin/clients/keramik/Makefile.am b/twin/clients/keramik/Makefile.am
index 17c1c3f9c..2ed77cac7 100644
--- a/twin/clients/keramik/Makefile.am
+++ b/twin/clients/keramik/Makefile.am
@@ -7,8 +7,8 @@ noinst_PROGRAMS           = embedtool
 noinst_HEADERS            = tiles.h
 
 embedtool_SOURCES         = embedtool.cpp
-embedtool_LDADD           = $(LIB_QT)
-embedtool_LDFLAGS         = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+embedtool_LDADD           = $(LIB_TQT)
+embedtool_LDFLAGS         = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 kde_module_LTLIBRARIES    = twin3_keramik.la
 
diff --git a/twin/clients/kwmtheme/cli_installer/Makefile.am b/twin/clients/kwmtheme/cli_installer/Makefile.am
index d9ee417ca..da05e496c 100644
--- a/twin/clients/kwmtheme/cli_installer/Makefile.am
+++ b/twin/clients/kwmtheme/cli_installer/Makefile.am
@@ -10,7 +10,7 @@ bin_PROGRAMS = 	kwmtheme
 kwmtheme_SOURCES = main.cpp 
 
 # the library search path. 
-kwmtheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kwmtheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 # the libraries to link against. Be aware of the order. First the libraries,
 # that depend on the following ones.
diff --git a/twin/killer/Makefile.am b/twin/killer/Makefile.am
index 048d403e5..3e66a05ba 100644
--- a/twin/killer/Makefile.am
+++ b/twin/killer/Makefile.am
@@ -4,6 +4,6 @@ bin_PROGRAMS = twin_killer_helper
 
 twin_killer_helper_SOURCES = killer.cpp
 twin_killer_helper_LDADD = $(LIB_TDEUI)
-twin_killer_helper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+twin_killer_helper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 METASOURCES = AUTO
diff --git a/twin/tools/Makefile.am b/twin/tools/Makefile.am
index 9593481d2..4ec110a7f 100644
--- a/twin/tools/Makefile.am
+++ b/twin/tools/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = decobenchmark
 INCLUDES = $(all_includes)
 
 test_gravity_SOURCES = test_gravity.cpp
-test_gravity_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+test_gravity_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 test_gravity_LDADD = $(LIB_X11)
 
 METASOURCES = AUTO