diff --git a/amarok/src/Makefile.am b/amarok/src/Makefile.am
index 7786068c..dbabf293 100644
--- a/amarok/src/Makefile.am
+++ b/amarok/src/Makefile.am
@@ -158,7 +158,7 @@ libamarok_la_LIBADD = \
     $(top_builddir)/amarok/src/statusbar/libstatusbar.la \
     $(top_builddir)/amarok/src/metadata/libmetadata.la \
     $(top_builddir)/amarok/src/magnatunebrowser/libmagnatunebrowser.la \
-    $(LIB_QT) $(LIB_TDEPARTS) -lDCOP -ltdefx $(KDE_MT_LIBS) $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEHTML) $(LIB_TDENEWSTUFF) \
+    $(LIB_TQT) $(LIB_TDEPARTS) -lDCOP -ltdefx $(KDE_MT_LIBS) $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEHTML) $(LIB_TDENEWSTUFF) \
     $(TAGLIB_LIBS) $(gl_libs) $(LIB_SQLITE) $(LIB_SQLITE_LOCAL) \
     $(LIB_TUNEPIMP) \
     $(mysql_libs) \
@@ -167,7 +167,7 @@ libamarok_la_LIBADD = \
 libamarok_la_LDFLAGS = \
     $(all_libraries) \
     $(KDE_RPATH) \
-    $(LIB_QT) \
+    $(LIB_TQT) \
     -lDCOP \
     $(LIB_TDECORE) \
     $(LIB_TDEUI)
@@ -206,7 +206,7 @@ amarokapp_LDADD = \
 amarokapp_LDFLAGS = \
     $(all_libraries) \
     $(KDE_RPATH) \
-    $(LIB_QT) \
+    $(LIB_TQT) \
     -lDCOP \
     $(LIB_TDECORE) \
     $(LIB_TDEUI)
diff --git a/amarok/src/collectionscanner/Makefile.am b/amarok/src/collectionscanner/Makefile.am
index 24e724a0..0e6f306e 100644
--- a/amarok/src/collectionscanner/Makefile.am
+++ b/amarok/src/collectionscanner/Makefile.am
@@ -19,7 +19,7 @@ amarokcollectionscanner_SOURCES = \
 amarokcollectionscanner_LDADD = \
     $(top_builddir)/amarok/src/metadata/libmetadata.la \
     $(top_builddir)/amarok/src/libamarok.la \
-    $(LIB_QT) \
+    $(LIB_TQT) \
     $(LIB_TDECORE) \
     $(TAGLIB_LIBS) \
     $(LIB_TDEIO)
@@ -27,7 +27,7 @@ amarokcollectionscanner_LDADD = \
 amarokcollectionscanner_LDFLAGS = \
     $(all_libraries) \
     $(KDE_RPATH) \
-    $(LIB_QT) \
+    $(LIB_TQT) \
     -lDCOP \
     $(LIB_TDECORE) \
     $(LIB_TDEUI) \
diff --git a/amarok/src/device/massstorage/Makefile.am b/amarok/src/device/massstorage/Makefile.am
index 5916a31a..22823f97 100644
--- a/amarok/src/device/massstorage/Makefile.am
+++ b/amarok/src/device/massstorage/Makefile.am
@@ -14,7 +14,7 @@ METASOURCES = AUTO
 
 libamarok_massstorage_device_la_LIBADD = \
     $(top_builddir)/amarok/src/libamarok.la \
-    $(LIB_TDECORE) $(LIB_QT)
+    $(LIB_TDECORE) $(LIB_TQT)
 
 libamarok_massstorage_device_la_LDFLAGS = \
     $(KDE_PLUGIN) \
diff --git a/amarok/src/device/nfs/Makefile.am b/amarok/src/device/nfs/Makefile.am
index 5ac39d68..940acfc9 100644
--- a/amarok/src/device/nfs/Makefile.am
+++ b/amarok/src/device/nfs/Makefile.am
@@ -14,7 +14,7 @@ METASOURCES = AUTO
 
 libamarok_nfs_device_la_LIBADD = \
     $(top_builddir)/amarok/src/libamarok.la \
-    $(LIB_TDECORE) $(LIB_QT)
+    $(LIB_TDECORE) $(LIB_TQT)
 
 libamarok_nfs_device_la_LDFLAGS = \
     $(KDE_PLUGIN) \
diff --git a/amarok/src/device/smb/Makefile.am b/amarok/src/device/smb/Makefile.am
index 044e5bdb..a1e77fad 100644
--- a/amarok/src/device/smb/Makefile.am
+++ b/amarok/src/device/smb/Makefile.am
@@ -14,7 +14,7 @@ METASOURCES = AUTO
 
 libamarok_smb_device_la_LIBADD = \
     $(top_builddir)/amarok/src/libamarok.la \
-    $(LIB_TDECORE) $(LIB_QT)
+    $(LIB_TDECORE) $(LIB_TQT)
 
 libamarok_smb_device_la_LDFLAGS = \
     $(KDE_PLUGIN) \
diff --git a/amarok/src/engine/void/Makefile.am b/amarok/src/engine/void/Makefile.am
index a07ad48a..9314f44d 100644
--- a/amarok/src/engine/void/Makefile.am
+++ b/amarok/src/engine/void/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES = \
 libamarok_void_engine_plugin_la_LIBADD = \
     $(top_builddir)/amarok/src/libamarok.la \
     $(top_builddir)/amarok/src/plugin/libplugin.la \
-    $(LIB_TDECORE) $(LIB_QT)
+    $(LIB_TDECORE) $(LIB_TQT)
 
 libamarok_void_engine_plugin_la_SOURCES = \
     void-engine.cpp
diff --git a/amarok/src/engine/xine/Makefile.am b/amarok/src/engine/xine/Makefile.am
index cdd2ebbc..735519b1 100644
--- a/amarok/src/engine/xine/Makefile.am
+++ b/amarok/src/engine/xine/Makefile.am
@@ -12,7 +12,7 @@ libamarok_xine_engine_la_LIBADD = \
     $(top_builddir)/amarok/src/libamarok.la \
     $(top_builddir)/amarok/src/plugin/libplugin.la \
     -ltdeui -ltdecore \
-    $(XINE_LIBS) $(LIB_QT)
+    $(XINE_LIBS) $(LIB_TQT)
 
 libamarok_xine_engine_la_SOURCES = \
     xine-scope.c \
diff --git a/amarok/src/engine/yauap/Makefile.am b/amarok/src/engine/yauap/Makefile.am
index 6aaae693..0b4f54dd 100644
--- a/amarok/src/engine/yauap/Makefile.am
+++ b/amarok/src/engine/yauap/Makefile.am
@@ -13,7 +13,7 @@ libamarok_yauap_engine_plugin_la_LIBADD = \
     $(top_builddir)/amarok/src/libamarok.la \
     $(top_builddir)/amarok/src/plugin/libplugin.la \
     $(LIB_YAUAP)\
-    $(LIB_TDECORE) $(LIB_QT)
+    $(LIB_TDECORE) $(LIB_TQT)
 
 
 libamarok_yauap_engine_plugin_la_SOURCES = \
diff --git a/amarok/src/konquisidebar/Makefile.am b/amarok/src/konquisidebar/Makefile.am
index 1ec0186a..faa72a96 100644
--- a/amarok/src/konquisidebar/Makefile.am
+++ b/amarok/src/konquisidebar/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = konqsidebar_universalamarok.la
 
 konqsidebar_universalamarok_la_SOURCES = universalamarok.cpp amarokdcopiface.stub
 konqsidebar_universalamarok_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkonqsidebarplugin
-konqsidebar_universalamarok_la_LIBADD = $(LIB_TDEHTML) $(LIB_QT) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI)
+konqsidebar_universalamarok_la_LIBADD = $(LIB_TDEHTML) $(LIB_TQT) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI)
 
 
 amarokdcopiface_DIR=$(top_srcdir)/amarok/src/amarokcore
diff --git a/amarok/src/loader/Makefile.am b/amarok/src/loader/Makefile.am
index 35958f3a..b624f924 100644
--- a/amarok/src/loader/Makefile.am
+++ b/amarok/src/loader/Makefile.am
@@ -7,10 +7,10 @@ amarok_SOURCES = \
         loader.cpp
 
 amarok_LDADD = \
-        $(LIB_QT) \
+        $(LIB_TQT) \
         $(LIB_TDEUI)
 
-amarok_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+amarok_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 METASOURCES = AUTO
 
diff --git a/amarok/src/mediadevice/daap/Makefile.am b/amarok/src/mediadevice/daap/Makefile.am
index 3880df1a..edf6b8a1 100644
--- a/amarok/src/mediadevice/daap/Makefile.am
+++ b/amarok/src/mediadevice/daap/Makefile.am
@@ -17,7 +17,7 @@ METASOURCES = AUTO
 libamarok_daap_mediadevice_la_LIBADD  = \
     $(top_builddir)/amarok/src/libamarok.la \
     $(top_builddir)/amarok/src/mediadevice/daap/daapreader/libdaapreader.la \
-    $(DNSSD_LIBS) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_QT)
+    $(DNSSD_LIBS) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TQT)
 
 libamarok_daap_mediadevice_la_LDFLAGS = \
     $(KDE_PLUGIN) \
diff --git a/amarok/src/mediadevice/daap/daapreader/Makefile.am b/amarok/src/mediadevice/daap/daapreader/Makefile.am
index 6565c09d..23e4d251 100644
--- a/amarok/src/mediadevice/daap/daapreader/Makefile.am
+++ b/amarok/src/mediadevice/daap/daapreader/Makefile.am
@@ -7,12 +7,12 @@ INCLUDES = \
 libdaapreader_la_SOURCES = reader.cpp
 
 libdaapreader_la_LIBADD = \
-        $(LIB_QT) \
+        $(LIB_TQT) \
         $(LIB_TDECORE) \
         $(LIB_TDEUI) \
         $(top_builddir)/amarok/src/mediadevice/daap/daapreader/authentication/libauthentication.la
 
-libdaapreader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+libdaapreader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 METASOURCES = AUTO
 
diff --git a/amarok/src/mediadevice/daap/daapreader/authentication/Makefile.am b/amarok/src/mediadevice/daap/daapreader/authentication/Makefile.am
index 4b81e98e..54ff1a7c 100644
--- a/amarok/src/mediadevice/daap/daapreader/authentication/Makefile.am
+++ b/amarok/src/mediadevice/daap/daapreader/authentication/Makefile.am
@@ -11,11 +11,11 @@ INCLUDES = \
 libauthentication_la_SOURCES = contentfetcher.cpp md5.c hasher.c
 
 libauthentication_la_LIBADD = \
-        $(LIB_QT) \
+        $(LIB_TQT) \
         $(LIB_TDECORE) \
         $(LIB_TDEUI)
 
-libauthentication_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+libauthentication_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 METASOURCES = AUTO
 
diff --git a/amarok/src/mediadevice/generic/Makefile.am b/amarok/src/mediadevice/generic/Makefile.am
index 8ce3fb01..d23c8ab4 100644
--- a/amarok/src/mediadevice/generic/Makefile.am
+++ b/amarok/src/mediadevice/generic/Makefile.am
@@ -15,7 +15,7 @@ METASOURCES = AUTO
 
 libamarok_generic_mediadevice_la_LIBADD  = \
     $(top_builddir)/amarok/src/libamarok.la \
-    $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_QT)
+    $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TQT)
 
 libamarok_generic_mediadevice_la_LDFLAGS = \
     $(KDE_PLUGIN) \
diff --git a/amarok/src/mediadevice/ifp/Makefile.am b/amarok/src/mediadevice/ifp/Makefile.am
index 0a572d05..5b5a8f3d 100644
--- a/amarok/src/mediadevice/ifp/Makefile.am
+++ b/amarok/src/mediadevice/ifp/Makefile.am
@@ -15,7 +15,7 @@ INCLUDES = \
 libamarok_ifp_mediadevice_la_LIBADD = \
     $(top_builddir)/amarok/src/libamarok.la \
     -lusb -lifp \
-    $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_QT)
+    $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TQT)
 
 libamarok_ifp_mediadevice_la_LDFLAGS = \
     $(KDE_PLUGIN) \
diff --git a/amarok/src/mediadevice/ipod/Makefile.am b/amarok/src/mediadevice/ipod/Makefile.am
index cd49a28e..23efc618 100644
--- a/amarok/src/mediadevice/ipod/Makefile.am
+++ b/amarok/src/mediadevice/ipod/Makefile.am
@@ -16,7 +16,7 @@ INCLUDES = \
 METASOURCES = AUTO
 
 libamarok_ipod_mediadevice_la_LIBADD  = \
-    $(top_builddir)/amarok/src/libamarok.la $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO)
+    $(top_builddir)/amarok/src/libamarok.la $(LIB_TQT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO)
 
 libamarok_ipod_mediadevice_la_LDFLAGS = \
     $(KDE_PLUGIN) \
diff --git a/amarok/src/mediadevice/mtp/Makefile.am b/amarok/src/mediadevice/mtp/Makefile.am
index 77736670..d91057d3 100644
--- a/amarok/src/mediadevice/mtp/Makefile.am
+++ b/amarok/src/mediadevice/mtp/Makefile.am
@@ -16,7 +16,7 @@ METASOURCES = AUTO
 
 libamarok_mtp_mediadevice_la_LIBADD  = \
     $(top_builddir)/amarok/src/libamarok.la \
-    $(LIBMTP_LIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
+    $(LIBMTP_LIBS) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI)
 
 libamarok_mtp_mediadevice_la_LDFLAGS = \
     $(KDE_PLUGIN) \
diff --git a/amarok/src/mediadevice/njb/Makefile.am b/amarok/src/mediadevice/njb/Makefile.am
index c9562336..455c922c 100644
--- a/amarok/src/mediadevice/njb/Makefile.am
+++ b/amarok/src/mediadevice/njb/Makefile.am
@@ -16,7 +16,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = libamarok_njb-mediadevice.la
 
 libamarok_njb_mediadevice_la_LIBADD = $(top_builddir)/amarok/src/libamarok.la \
-	$(LIB_TDEUI) $(LIB_TDECORE) -lnjb $(LIB_QT) $(LIB_TDEIO)
+	$(LIB_TDEUI) $(LIB_TDECORE) -lnjb $(LIB_TQT) $(LIB_TDEIO)
 
 libamarok_njb_mediadevice_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
 
diff --git a/amarok/src/mediadevice/riokarma/Makefile.am b/amarok/src/mediadevice/riokarma/Makefile.am
index 61113ada..0e604838 100644
--- a/amarok/src/mediadevice/riokarma/Makefile.am
+++ b/amarok/src/mediadevice/riokarma/Makefile.am
@@ -16,7 +16,7 @@ METASOURCES = AUTO
 
 libamarok_riokarma_mediadevice_la_LIBADD  = \
     $(top_builddir)/amarok/src/libamarok.la \
-    -lkarma $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
+    -lkarma $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI)
 
 libamarok_riokarma_mediadevice_la_LDFLAGS = \
     $(KDE_PLUGIN) \
diff --git a/amarok/src/scripts/graphequalizer/Makefile.am b/amarok/src/scripts/graphequalizer/Makefile.am
index d0c5378e..f2a0ddaf 100644
--- a/amarok/src/scripts/graphequalizer/Makefile.am
+++ b/amarok/src/scripts/graphequalizer/Makefile.am
@@ -17,11 +17,11 @@ graphequalizer_SOURCES = \
 graphequalizer_DATA = README
 
 graphequalizer_LDADD = \
-        $(LIB_QT) \
+        $(LIB_TQT) \
         $(LIB_TDEUI) \
         $(LIB_TDECORE)
 
-graphequalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+graphequalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 METASOURCES = AUTO
 
diff --git a/amarok/src/statusbar/Makefile.am b/amarok/src/statusbar/Makefile.am
index c72ba5f6..41aea8f1 100644
--- a/amarok/src/statusbar/Makefile.am
+++ b/amarok/src/statusbar/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES = \
     -I$(top_builddir)/amarok/src/ \
     $(all_includes)
     
-libstatusbar_la_LIBADD = $(LIB_QT)
+libstatusbar_la_LIBADD = $(LIB_TQT)
 
 libstatusbar_la_SOURCES = \
     statusBarBase.cpp \