diff --git a/blinken/src/Makefile.am b/blinken/src/Makefile.am
index d6a19815..2bee35a6 100644
--- a/blinken/src/Makefile.am
+++ b/blinken/src/Makefile.am
@@ -8,7 +8,7 @@ bin_PROGRAMS = blinken
 
 INCLUDES = $(all_includes)
 
-blinken_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+blinken_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 blinken_LDADD = $(LIB_TDEUI) $(LIB_TDEIO) $(artslib)
 
 blinken_SOURCES = main.cpp blinken.cpp artsplayer.cpp blinkengame.cpp number.cpp highscoredialog.cpp counter.cpp fontutils.cpp fontchecker.cpp button.cpp settings.kcfgc
diff --git a/kalzium/src/Makefile.am b/kalzium/src/Makefile.am
index d781491e..1667d5b7 100644
--- a/kalzium/src/Makefile.am
+++ b/kalzium/src/Makefile.am
@@ -79,7 +79,7 @@ rcui_DATA = kalziumui.rc
 KDE_ICON = AUTO
 
 # the library search path. 
-kalzium_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kalzium_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 #this RegExp-monster grep for <name origin=foo">bar</name> and puts the i18n() around foo and bar
 messages-old: rc.cpp
diff --git a/kanagram/src/Makefile.am b/kanagram/src/Makefile.am
index 76bd52cd..d41eb7a4 100644
--- a/kanagram/src/Makefile.am
+++ b/kanagram/src/Makefile.am
@@ -28,7 +28,7 @@ bin_PROGRAMS = kanagram
 
 # the application source, library search path, and link libraries
 kanagram_SOURCES = main.cpp kanagram.cpp kanagramgame.cpp fontutils.cpp kanagramsettings.kcfgc mainsettingswidget.ui vocabsettingswidget.ui vocabeditwidget.ui mainsettings.cpp vocabsettings.cpp vocabedit.cpp keduvocdocument.cpp keduvocexpression.cpp keduvockvtmlreader.cpp keduvockvtmlwriter.cpp leitnerbox.cpp leitnersystem.cpp multiplechoice.cpp grammarmanager.cpp leitnersystemview.cpp newstuffwidget.ui newstuffdialog.cpp newstuff.cpp
-kanagram_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kanagram_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kanagram_LDADD =  $(LIB_TDEUI) $(LIB_TDENEWSTUFF) $(LIB_TDEIO) $(artslib)
 
 kde_kcfg_DATA=kanagram.kcfg
diff --git a/kbruch/src/Makefile.am b/kbruch/src/Makefile.am
index ede0aee6..ec27fcac 100644
--- a/kbruch/src/Makefile.am
+++ b/kbruch/src/Makefile.am
@@ -4,7 +4,7 @@ kbruch_COMPILE_FIRST = version.h
 kbruch_SOURCES = exercisebase.cpp taskvieweroptionsbase.ui task.cpp ratio.cpp taskview.cpp statisticsview.cpp primenumber.cpp kbruch.cpp mainqtwidget.cpp taskwidget.cpp fractionbasewidget.cpp resultwidget.cpp exercisecompare.cpp ratiowidget.cpp rationalwidget.cpp exerciseconvert.cpp exercisefactorize.cpp factorizedwidget.cpp settingsclass.kcfgc
 kbruch_LDADD   =  $(LIB_TDEUI)
 # the library search path.
-kbruch_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kbruch_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 EXTRA_DIST = kbruch.cpp kbruch.h kbruch.desktop hi32-app-kbruch.png hi16-app-kbruch.png lo32-app-kbruch.png lo16-app-kbruch.png mainqtwidget.cpp mainqtwidget.h primenumber.cpp primenumber.h statisticsview.cpp statisticsview.h exercisebase.cpp exercisebase.h taskview.cpp taskview.h ratio.cpp ratio.h task.cpp task.h taskwidget.cpp taskwidget.h fractionbasewidget.cpp fractionbasewidget.h resultwidget.cpp resultwidget.h exercisecompare.cpp exercisecompare.h ratiowidget.cpp ratiowidget.h rationalwidget.cpp rationalwidget.h exerciseconvert.cpp exerciseconvert.h exercisefactorize.cpp exercisefactorize.h factorizedwidget.cpp factorizedwidget.h kbruch.rc taskvieweroptionsbase.ui
 
diff --git a/kbruch/testcases/Makefile.am b/kbruch/testcases/Makefile.am
index b2389856..5f4f8094 100644
--- a/kbruch/testcases/Makefile.am
+++ b/kbruch/testcases/Makefile.am
@@ -5,7 +5,7 @@ kbruch_test_SOURCES = task.cpp ratio.cpp ratio_test.cpp primenumber.cpp primenum
 kbruch_test_LDADD   = -lboost_unit_test_framework-gcc $(LIB_TDEUI)
 
 # the library search path.
-kbruch_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kbruch_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 EXTRA_DIST = primenumber.cpp primenumber.h ratio.cpp ratio.h task.cpp task.h primenumber_test.cpp ratio_test.cpp kbruch_test.cpp
 
diff --git a/keduca/keduca/Makefile.am b/keduca/keduca/Makefile.am
index efc38114..f7a44483 100644
--- a/keduca/keduca/Makefile.am
+++ b/keduca/keduca/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES= -I../libkeduca $(all_includes)
 # The binary program keduca
 bin_PROGRAMS   = keduca
 keduca_LDFLAGS = $(all_libraries)
-keduca_LDADD   = $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) ../libkeduca/libkeduca.la
+keduca_LDADD   = $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) ../libkeduca/libkeduca.la
 keduca_SOURCES = main.cpp keduca.cpp 
 
 # Convenience library
@@ -17,7 +17,7 @@ keduca_SOURCES = main.cpp keduca.cpp
 
 # The KParts Component
 kde_module_LTLIBRARIES = libkeducapart.la
-libkeducapart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
+libkeducapart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
 libkeducapart_la_LIBADD  = ../libkeduca/libkeduca.la $(LIB_TDEPARTS)
 libkeducapart_la_SOURCES = keduca_part.cpp tderadioeduca.cpp kquestion.cpp \
                            kgroupeduca.cpp keducaview.cpp keducaprefs.cpp \
diff --git a/keduca/keducabuilder/Makefile.am b/keduca/keducabuilder/Makefile.am
index 160d29c1..97a999ce 100644
--- a/keduca/keducabuilder/Makefile.am
+++ b/keduca/keducabuilder/Makefile.am
@@ -23,7 +23,7 @@ INCLUDES= -I../libkeduca $(all_includes)
 METASOURCES = AUTO
 
 # the library search path. 
-keducabuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+keducabuilder_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/keduca/libkeduca/Makefile.am b/keduca/libkeduca/Makefile.am
index 1e1cf9c6..b7eeb7eb 100644
--- a/keduca/libkeduca/Makefile.am
+++ b/keduca/libkeduca/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES=$(all_includes)
 
 noinst_LTLIBRARIES = libkeduca.la
 libkeduca_la_SOURCES = kgallerydialogbase.ui fileread.cpp kgallerydialog.cpp
-libkeduca_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+libkeduca_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 libkeduca_la_LIBADD  = -ltdeprint
 noinst_HEADERS = fileread.h kgallerydialog.h kgallerydialogbase.h
 
diff --git a/kgeography/src/Makefile.am b/kgeography/src/Makefile.am
index 54a3bede..196a8020 100644
--- a/kgeography/src/Makefile.am
+++ b/kgeography/src/Makefile.am
@@ -8,7 +8,7 @@ bin_PROGRAMS = kgeography
 INCLUDES         = $(all_includes)
 
 # the library search path.
-kgeography_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kgeography_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 # the libraries to link against.
 kgeography_LDADD = $(LIB_TDEUI)
@@ -39,5 +39,5 @@ valgrind: kgeography
 
 noinst_PROGRAMS = script
 script_SOURCES = script.cpp
-script_LDADD = $(LIB_QT)
+script_LDADD = $(LIB_TQT)
 script_LDFLAGS = $(all_libraries)
diff --git a/khangman/khangman.kdevprj b/khangman/khangman.kdevprj
index 1354ff38..dac4580d 100644
--- a/khangman/khangman.kdevprj
+++ b/khangman/khangman.kdevprj
@@ -22,7 +22,7 @@ bin_program=khangman
 cflags=
 cppflags=
 cxxflags=\s-O0
-ldadd=\s$(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+ldadd=\s$(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)
 ldflags=
 libtool_dir=
 path_to_bin_program=./khangman
diff --git a/khangman/khangman/Makefile.am b/khangman/khangman/Makefile.am
index 50652ad6..23267864 100644
--- a/khangman/khangman/Makefile.am
+++ b/khangman/khangman/Makefile.am
@@ -17,7 +17,7 @@ INCLUDES= -I$(top_srcdir)/libtdeedu/tdeeducore $(all_includes)
 METASOURCES = AUTO
 
 # the library search path.
-khangman_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+khangman_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 rc_DATA = khangmanui.rc
 rcdir = $(kde_datadir)/khangman
diff --git a/kig/Makefile.am b/kig/Makefile.am
index 5081c354..80be71c8 100644
--- a/kig/Makefile.am
+++ b/kig/Makefile.am
@@ -25,7 +25,7 @@ SUBDIRS = \
 
 kde_module_LTLIBRARIES = libkigpart.la
 libkigpart_la_SOURCES = dummy.cpp
-libkigpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -ltdetexteditor
+libkigpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -ltdetexteditor
 libkigpart_la_LIBADD  = $(LIB_TDEPARTS) \
 	misc/libmisc.la objects/libobjects.la filters/libfilters.la \
 	modes/libmodes.la kig/libkigparttemp.la $(scriptinglib)
diff --git a/kig/kig/Makefile.am b/kig/kig/Makefile.am
index f01a4b29..a2908846 100644
--- a/kig/kig/Makefile.am
+++ b/kig/kig/Makefile.am
@@ -23,7 +23,7 @@ bin_PROGRAMS = kig
 
 # the application source, library search path, and link libraries
 kig_SOURCES = main.cpp kig.cpp
-kig_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kig_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kig_LDADD   = $(LIB_TDEPARTS)
 
 # this is where the desktop file will go 
diff --git a/kig/tdefile/Makefile.am b/kig/tdefile/Makefile.am
index ca77dc8e..59d1817d 100644
--- a/kig/tdefile/Makefile.am
+++ b/kig/tdefile/Makefile.am
@@ -9,11 +9,11 @@ kde_module_LTLIBRARIES = \
 	tdefile_kig.la
 
 tdefile_drgeo_la_SOURCES = tdefile_drgeo.cpp
-tdefile_drgeo_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -module $(KDE_PLUGIN)
+tdefile_drgeo_la_LDFLAGS = $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -module $(KDE_PLUGIN)
 tdefile_drgeo_la_LIBADD = $(LIB_TDEIO)
 
 tdefile_kig_la_SOURCES = tdefile_kig.cpp
-tdefile_kig_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -module $(KDE_PLUGIN)
+tdefile_kig_la_LDFLAGS = $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -module $(KDE_PLUGIN)
 tdefile_kig_la_LIBADD = $(LIB_TDEIO)
 
 METASOURCES = AUTO
diff --git a/kiten/Makefile.am b/kiten/Makefile.am
index 944d816e..98ec6868 100644
--- a/kiten/Makefile.am
+++ b/kiten/Makefile.am
@@ -6,14 +6,14 @@ kiten_SOURCES = main.cpp kiten.cpp learn.cpp kloader.cpp ksaver.cpp \
 	configsearching.ui configlearn.ui configfont.ui configdictionariesbase.ui \
 	configdictionaries.cpp optiondialog.cpp kitenconfig.kcfgc
 
-kiten_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kiten_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kiten_LDADD = libkiten.la $(LIB_TDEIO)
 
 bin_PROGRAMS = kiten kitengen
 lib_LTLIBRARIES = libkiten.la
 
 libkiten_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -version-info 1:0:0
-libkiten_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEPRINT) $(LIB_QT) $(LIB_TDECORE)
+libkiten_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEPRINT) $(LIB_TQT) $(LIB_TDECORE)
 
 libkiten_la_SOURCES = asyndeta.cpp dict.cpp widgets.cpp kromajiedit.cpp rad.cpp \
 	deinf.cpp kitenconfig.kcfgc
@@ -23,7 +23,7 @@ libkiteninclude_HEADERS = \
 	asyndeta.h dict.h widgets.h kromajiedit.h rad.h deinf.h
 
 kitengen_SOURCES = xjdxgen.c
-kitengen_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kitengen_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 METASOURCES = AUTO
 
diff --git a/klatin/klatin/Makefile.am b/klatin/klatin/Makefile.am
index b5d40d94..227b7fb8 100644
--- a/klatin/klatin/Makefile.am
+++ b/klatin/klatin/Makefile.am
@@ -12,7 +12,7 @@ bin_PROGRAMS = klatin
 INCLUDES         = $(all_includes)
 
 # the library search path.
-klatin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+klatin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 # the libraries to link against.
 klatin_LDADD   = $(LIB_TDEFILE) $(top_builddir)/libtdeedu/tdeeducore/libtdeeducore.la
diff --git a/klettres/klettres/Makefile.am b/klettres/klettres/Makefile.am
index 168efc4e..26d66c09 100644
--- a/klettres/klettres/Makefile.am
+++ b/klettres/klettres/Makefile.am
@@ -24,7 +24,7 @@ METASOURCES = AUTO
 KDE_ICON = AUTO
 
 # the library search path.
-klettres_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+klettres_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 messages: rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/klettres.pot;
diff --git a/kmplot/kmplot/Makefile.am b/kmplot/kmplot/Makefile.am
index 4d971fbd..d21b58fc 100644
--- a/kmplot/kmplot/Makefile.am
+++ b/kmplot/kmplot/Makefile.am
@@ -25,7 +25,7 @@ bin_PROGRAMS = kmplot
 
 # the application source, library search path, and link libraries
 kmplot_SOURCES = main.cpp kmplot.cpp kmplotprogress.cpp kmplotIface.skel
-kmplot_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPARTS) -lDCOP
+kmplot_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPARTS) -lDCOP
 kmplot_LDADD   = $(LIB_TDEPARTS)
 
 kmplot_COMPILE_FIRST = FktDlgData.h qminmax.h settings.h
@@ -46,8 +46,8 @@ kde_module_LTLIBRARIES = libkmplotpart.la
 
 # the Part's source, library search path, and link libraries
 libkmplotpart_la_SOURCES = FktDlgData.ui parser.cpp xparser.cpp  diagr.cpp View.cpp MainDlg.cpp FktDlg.cpp kprinterdlg.cpp settings.kcfgc settingspagecolor.ui kconstanteditor.cpp qparametereditor.ui kparametereditor.cpp settingspagecoords.ui settingspagefonts.ui settingspagescaling.ui settingspageprecision.ui qeditparametric.ui keditparametric.cpp qeditpolar.ui keditpolar.cpp editfunctionpage.ui editderivativespage.ui editintegralpage.ui editfunction.cpp qeditconstant.ui qminmax.ui kminmax.cpp qconstanteditor.ui keditconstant.cpp kmplotio.cpp sliderwindow.ui ksliderwindow.cpp MainDlgIface.skel parseriface.skel Viewiface.skel coordsconfigdialog.cpp
-libkmplotpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPARTS) -lDCOP
-libkmplotpart_la_LIBADD  = $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIBSOCKET) $(LIB_TDEPRINT)
+libkmplotpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPARTS) -lDCOP
+libkmplotpart_la_LIBADD  = $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) $(LIBSOCKET) $(LIB_TDEPRINT)
 
 # this is where the desktop file will go
 partdesktopdir   = $(kde_servicesdir)
diff --git a/kpercentage/kpercentage/Makefile.am b/kpercentage/kpercentage/Makefile.am
index 6eefc6cc..9a2c510c 100644
--- a/kpercentage/kpercentage/Makefile.am
+++ b/kpercentage/kpercentage/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = kpercentage
 kpercentage_SOURCES =  kanimation.cpp kanswer.cpp kpercentmain.cpp  kpercentage.cpp ksplashscreen.cpp main.cpp
-kpercentage_LDADD   =  $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIBSOCKET)
+kpercentage_LDADD   =  $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) $(LIBSOCKET)
 
 SUBDIRS = icons pics
 
@@ -30,7 +30,7 @@ METASOURCES = AUTO
 
 
 # the library search path.
-kpercentage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kpercentage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 
 stringstocpp:
diff --git a/kstars/kstars.kdevprj b/kstars/kstars.kdevprj
index 50c4a484..92c7f05e 100644
--- a/kstars/kstars.kdevprj
+++ b/kstars/kstars.kdevprj
@@ -22,7 +22,7 @@ bin_program=kstars
 cflags=
 cppflags=
 cxxflags=\s-O0 -g3 -Wall
-ldadd=-ltdeio -ltdeprint -lm $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+ldadd=-ltdeio -ltdeprint -lm $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)
 ldflags=\s\s
 
 [General]
diff --git a/kstars/kstars/Makefile.am b/kstars/kstars/Makefile.am
index ef7cae2d..c90b8ca4 100644
--- a/kstars/kstars/Makefile.am
+++ b/kstars/kstars/Makefile.am
@@ -54,7 +54,7 @@ INCLUDES= -I$(top_srcdir) -Itools -I$(srcdir)/tools $(all_includes)
 METASOURCES = AUTO
 
 # the library search path.
-kstars_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kstars_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
diff --git a/kstars/kstars/indi/Makefile.am b/kstars/kstars/indi/Makefile.am
index 303dffad..fc78522a 100644
--- a/kstars/kstars/indi/Makefile.am
+++ b/kstars/kstars/indi/Makefile.am
@@ -20,59 +20,59 @@ noinst_LIBRARIES =  liblilxml.a libindicom.a
 
 indiserver_SOURCES = indiserver.c fq.c
 indiserver_LDADD = liblilxml.a ${LIBPTHREAD} ${USE_THREADS} $(LIBSOCKET)
-indiserver_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS)
+indiserver_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS)
 
 lx200generic_SOURCES = indidrivermain.c base64.c eventloop.c lx200driver.c lx200autostar.cpp lx200_16.cpp lx200gps.cpp lx200generic.cpp lx200classic.cpp
 lx200generic_LDADD = liblilxml.a libindicom.a -lm
-lx200generic_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS)
+lx200generic_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS)
 
 lx200basic_SOURCES = indidrivermain.c base64.c eventloop.c lx200driver.c lx200basic.cpp
 lx200basic_LDADD = liblilxml.a libindicom.a
-lx200basic_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS)
+lx200basic_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS)
 
 celestrongps_SOURCES =  indidrivermain.c base64.c eventloop.c celestronprotocol.c celestrongps.cpp
 celestrongps_LDADD = liblilxml.a libindicom.a -lm
-celestrongps_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS)
+celestrongps_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS)
 
 apmount_SOURCES = indidrivermain.c base64.c eventloop.c  lx200driver.c apmount.cpp
 apmount_LDADD =  liblilxml.a libindicom.a
-apmount_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS)
+apmount_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS)
 
 fliccd_SOURCES =  eventloop.c base64.c fli_ccd.c indidrivermain.c
 fliccd_LDADD = fli/libfli.la libindicom.a liblilxml.a -lm -lz $(LIBSOCKET)
-fliccd_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS)
+fliccd_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS)
 
 fliwheel_SOURCES =  eventloop.c base64.c fli_wheel.c indidrivermain.c
 fliwheel_LDADD = fli/libfli.la libindicom.a liblilxml.a -lm
-fliwheel_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS)
+fliwheel_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS)
 
 v4ldriver_SOURCES = eventloop.c base64.c indidrivermain.c v4ldriver.cpp indi_v4l.cpp
 v4ldriver_LDADD = libindicom.a liblilxml.a webcam/libwebcam.la -lm -lz
-v4ldriver_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS)
+v4ldriver_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS)
 
 v4lphilips_SOURCES = eventloop.c base64.c indidrivermain.c v4ldriver.cpp v4lphilips.cpp indi_philips.cpp
 v4lphilips_LDADD = libindicom.a liblilxml.a webcam/libwebcam.la -lm -lz
-v4lphilips_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS)
+v4lphilips_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS)
 
 meade_lpi_SOURCES = eventloop.c base64.c indidrivermain.c v4ldriver.cpp indi_lpi.cpp
 meade_lpi_LDADD = libindicom.a liblilxml.a webcam/libwebcam.la -lz
-meade_lpi_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS)
+meade_lpi_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS)
 
 temma_SOURCES =  indidrivermain.c base64.c eventloop.c temmadriver.c
 temma_LDADD = liblilxml.a libindicom.a -lm
-temma_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS)
+temma_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS)
 
 skycommander_SOURCES =  indidrivermain.c base64.c eventloop.c lx200driver.c skycommander.c
 skycommander_LDADD = liblilxml.a libindicom.a -lm
-skycommander_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS)
+skycommander_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS)
 
 apogee_ppi_SOURCES = apogee_ppi.cpp base64.c eventloop.c indidrivermain.c
 apogee_ppi_LDADD = libindicom.a liblilxml.a apogee/libapogee_PPI.la -lz
-apogee_ppi_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS)
+apogee_ppi_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS)
 
 sbigccd_SOURCES = sbigccd.cpp base64.c eventloop.c indidrivermain.c
 sbigccd_LDADD = libindicom.a liblilxml.a -lz
-sbigccd_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS)
+sbigccd_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS)
 
 install-exec-hook:
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
diff --git a/ktouch/src/Makefile.am b/ktouch/src/Makefile.am
index f7b33145..5a05aa28 100644
--- a/ktouch/src/Makefile.am
+++ b/ktouch/src/Makefile.am
@@ -50,7 +50,7 @@ ktouch_SOURCES = ktouchchartwidget.cpp ktouchcoloreditor_dlg.ui \
 		ktouchutils.cpp main.cpp prefs.kcfgc ktouchcoloreditor.cpp
 
 # the library search path.
-ktouch_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+ktouch_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/kturtle/src/Makefile.am b/kturtle/src/Makefile.am
index a5706a23..83d7eef5 100644
--- a/kturtle/src/Makefile.am
+++ b/kturtle/src/Makefile.am
@@ -4,9 +4,9 @@ INCLUDES = $(all_includes)
 SUBDIRS = pics
 
 # added from kjots
-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
 
-kturtle_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kturtle_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kturtle_LDADD = $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPRINT) $(LIB_TDEPARTS) -lkatepartinterfaces
 
 KDE_ICON = kturtle
diff --git a/kverbos/kverbos/Makefile.am b/kverbos/kverbos/Makefile.am
index 88dd731f..c59c1752 100644
--- a/kverbos/kverbos/Makefile.am
+++ b/kverbos/kverbos/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = icons data
 
 bin_PROGRAMS = kverbos
 kverbos_SOURCES = kfeedercontrol.cpp kresult.cpp qresult.ui verbspanish.cpp kverbosuser.cpp kerfassen.cpp qerfassen.ui kverbedit.cpp qverbedit.ui qverbosoptions.ui kverbosoptions.cpp qlernen.ui kstartuplogo.cpp kverbosview.cpp kverbosdoc.cpp kverbos.cpp main.cpp prefs.kcfgc
-kverbos_LDADD   =  $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIBSOCKET)
+kverbos_LDADD   =  $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) $(LIBSOCKET)
 
 
 EXTRA_DIST = kfeedercontrol.cpp kfeedercontrol.h main.cpp kverbos.cpp kverbos.h kverbosdoc.cpp kverbosdoc.h kverbosview.cpp kverbosview.h kverbosui.rc kverbos.desktop kstartuplogo.cpp kstartuplogo.h startuplogo.png qlernen.ui kverbosoptions.cpp kverbosoptions.h qverbosoptions.ui qverbedit.ui kverbedit.cpp kverbedit.h qerfassen.ui kerfassen.cpp kerfassen.h deu16.png span16.png kverbosuser.cpp kverbosuser.h verbspanish.cpp verbspanish.h qresult.ui kverbosuser.png kresult.cpp kresult.h
@@ -19,7 +19,7 @@ INCLUDES= $(all_includes)
 METASOURCES = AUTO
 
 # the library search path. 
-kverbos_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kverbos_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 rcdir = $(kde_datadir)/kverbos
 rc_DATA = kverbosui.rc
diff --git a/kvoctrain/kvoctrain/Makefile.am b/kvoctrain/kvoctrain/Makefile.am
index 24aa6427..f053f0b7 100644
--- a/kvoctrain/kvoctrain/Makefile.am
+++ b/kvoctrain/kvoctrain/Makefile.am
@@ -40,8 +40,8 @@ INCLUDES = -I$(srcdir)/.. -I$(srcdir)/kvt-core -Icommon-dialogs \
 bin_PROGRAMS = kvoctrain spotlight2kvtml
 
 # the library search path.
-kvoctrain_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-spotlight2kvtml_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kvoctrain_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+spotlight2kvtml_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 CLEANFILES = *.i.c
 
diff --git a/kvoctrain/kvoctrain/kvt-core/Makefile.am b/kvoctrain/kvoctrain/kvt-core/Makefile.am
index e31da775..947a6c57 100644
--- a/kvoctrain/kvoctrain/kvt-core/Makefile.am
+++ b/kvoctrain/kvoctrain/kvt-core/Makefile.am
@@ -12,6 +12,6 @@ libkvoctraincore_la_SOURCES = langset.cpp LineList.cpp kvoctrainexpr.cpp \
 
 SUBDIRS = kvt-xml
 
-libkvoctraincore_la_LIBADD= $(all_libraries) $(KDE_RPATH) kvt-xml/libkvtxml.la ../common-dialogs/libcommondlg.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI) -lDCOP
+libkvoctraincore_la_LIBADD= $(all_libraries) $(KDE_RPATH) kvt-xml/libkvtxml.la ../common-dialogs/libcommondlg.la $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI) -lDCOP
 
 noinst_HEADERS = grammarmanager.h
diff --git a/kwordquiz/src/Makefile.am b/kwordquiz/src/Makefile.am
index 131e89a7..a1f80bce 100644
--- a/kwordquiz/src/Makefile.am
+++ b/kwordquiz/src/Makefile.am
@@ -11,7 +11,7 @@ kwordquiz_SOURCES = kwordquizprefs.cpp kwordquizview.cpp kwordquizdoc.cpp \
 			kvtmlwriter.cpp dlglanguage.cpp wqprintdialogpage.cpp prefcharacter.cpp \
 			prefcharacterbase.ui paukerreader.cpp wqlreader.cpp wqlwriter.cpp wqundo.cpp prefs.kcfgc \
 		prefcardappearance.cpp prefcardappearancebase.ui kwqnewstuff.cpp kwqnewstuff.h
-kwordquiz_LDADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) \
+kwordquiz_LDADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) \
 	$(LIBSOCKET) $(LIB_TDEPRINT) $(LIB_TDENEWSTUFF)
 
 
@@ -50,7 +50,7 @@ SUBDIRS = . pics examples
 METASOURCES = AUTO
 
 # the library search path.
-kwordquiz_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kwordquiz_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 rcdir = $(kde_datadir)/kwordquiz
 rc_DATA = kwordquizui.rc eventsrc
diff --git a/libtdeedu/extdate/Makefile.am b/libtdeedu/extdate/Makefile.am
index e9fe3c61..88db3cee 100644
--- a/libtdeedu/extdate/Makefile.am
+++ b/libtdeedu/extdate/Makefile.am
@@ -7,15 +7,15 @@ lib_LTLIBRARIES = libextdate.la
 libextdate_la_SOURCES = extdatetime.cpp extcalendarsystem.cpp extcalendarsystemgregorian.cpp extdatetbl.cpp extdatepicker.cpp extdatetimeedit.cpp extdatewidget.cpp
 
 libextdate_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
-libextdate_la_LIBADD = $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE)
+libextdate_la_LIBADD = $(LIB_TDEUI) $(LIB_TQT) $(LIB_TDECORE)
 
 test_extdate_SOURCES = test_extdate.cc
 test_extdate_LDADD = libextdate.la
-test_extdate_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+test_extdate_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 test_extdatepicker_SOURCES = testwidget.cpp main.cpp
 test_extdatepicker_LDADD = libextdate.la
-test_extdatepicker_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+test_extdatepicker_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 METASOURCES = AUTO
 
diff --git a/libtdeedu/tdeeducore/Makefile.am b/libtdeedu/tdeeducore/Makefile.am
index 856037fd..61c56091 100644
--- a/libtdeedu/tdeeducore/Makefile.am
+++ b/libtdeedu/tdeeducore/Makefile.am
@@ -11,7 +11,7 @@ libtdeeducore_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
 libtdeeducode_includedir = $(includedir)/libtdeedu
 libtdeeducode_include_HEADERS = keduvocdata.h
 
-libtdeeducore_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
+libtdeeducore_la_LIBADD = $(LIB_TDECORE) $(LIB_TQT)
 
 METASOURCES = AUTO
 
diff --git a/libtdeedu/tdeeduplot/Makefile.am b/libtdeedu/tdeeduplot/Makefile.am
index 21b84f2a..00d8f278 100644
--- a/libtdeedu/tdeeduplot/Makefile.am
+++ b/libtdeedu/tdeeduplot/Makefile.am
@@ -9,7 +9,7 @@ libtdeeduplotinclude_HEADERS = kplotobject.h kplotaxis.h kplotwidget.h
 libtdeeduplot_la_SOURCES = kplotobject.cpp kplotaxis.cpp kplotwidget.cpp
 
 libtdeeduplot_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
-libtdeeduplot_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
+libtdeeduplot_la_LIBADD = $(LIB_TDECORE) $(LIB_TQT)
 
 METASOURCES = AUTO
 
diff --git a/libtdeedu/tdeeduui/Makefile.am b/libtdeedu/tdeeduui/Makefile.am
index 0cc29e05..3b19aeea 100644
--- a/libtdeedu/tdeeduui/Makefile.am
+++ b/libtdeedu/tdeeduui/Makefile.am
@@ -10,7 +10,7 @@ libtdeeduuiincludedir = $(includedir)/libtdeedu
 libtdeeduuiinclude_HEADERS = tdeeduglossary.h
 
 libtdeeduui_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:5:0
-libtdeeduui_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_QT)
+libtdeeduui_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_TQT)
 
 METASOURCES = AUTO