summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-09-17 23:19:51 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2018-09-17 23:19:51 +0900
commit0c5985ae033c0dcd608c0e2470b4e5260eb464e2 (patch)
tree9c2e3f57a1b2858cb71b90e4c65e8305359e21ef
parentcbe888f1c4ace25d81ecc352c393c9b314c51abd (diff)
downloadtdelibs-0c5985ae033c0dcd608c0e2470b4e5260eb464e2.tar.gz
tdelibs-0c5985ae033c0dcd608c0e2470b4e5260eb464e2.zip
LIB_QT -> LIB_TQT conversion to align to updated admin module
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--arts/kde/Makefile.am2
-rw-r--r--arts/knotify/Makefile.am4
-rw-r--r--dcop/Makefile.am10
-rw-r--r--dcop/client/Makefile.am8
-rw-r--r--dcop/dcopidl/Makefile.am2
-rw-r--r--dcop/dcopidl2cpp/Makefile.am2
-rw-r--r--dnssd/Makefile.am2
-rw-r--r--interfaces/tdeimproxy/library/Makefile.am2
-rw-r--r--interfaces/tdemediaplayer/Makefile.am2
-rw-r--r--interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am2
-rw-r--r--interfaces/tdescript/Makefile.am4
-rw-r--r--interfaces/tdescript/sample/Makefile.am2
-rw-r--r--interfaces/tdetexteditor/Makefile.am4
-rw-r--r--interfaces/terminal/test/Makefile.am2
-rw-r--r--kate/interfaces/Makefile.am2
-rw-r--r--kate/part/Makefile.am2
-rw-r--r--kate/plugins/insertfile/Makefile.am2
-rw-r--r--kate/plugins/isearch/Makefile.am2
-rw-r--r--kate/plugins/kdatatool/Makefile.am2
-rw-r--r--kate/plugins/wordcompletion/Makefile.am2
-rw-r--r--kded/Makefile.am10
-rw-r--r--kdoctools/Makefile.am4
-rw-r--r--kimgio/Makefile.am26
-rw-r--r--libtdemid/Makefile.am2
-rw-r--r--libtdescreensaver/Makefile.am2
-rw-r--r--pics/Makefile.am2
-rw-r--r--tdeabc/Makefile.am4
-rw-r--r--tdeabc/formats/Makefile.am2
-rw-r--r--tdeabc/plugins/dir/Makefile.am4
-rw-r--r--tdeabc/plugins/file/Makefile.am4
-rw-r--r--tdeabc/plugins/ldaptdeio/Makefile.am4
-rw-r--r--tdeabc/plugins/net/Makefile.am2
-rw-r--r--tdeabc/tests/Makefile.am24
-rw-r--r--tdeabc/vcard/Makefile.am6
-rw-r--r--tdeabc/vcardparser/Makefile.am6
-rw-r--r--tdecert/Makefile.am2
-rw-r--r--tdecmshell/Makefile.am2
-rw-r--r--tdeconf_update/Makefile.am2
-rw-r--r--tdecore/Makefile.am2
-rw-r--r--tdecore/tdeconfig_compiler/Makefile.am2
-rw-r--r--tdecore/tdeconfig_compiler/example/Makefile.am4
-rw-r--r--tdecore/tdeconfig_compiler/tests/Makefile.am20
-rw-r--r--tdefx/Makefile.am2
-rw-r--r--tdehtml/Makefile.am6
-rw-r--r--tdehtml/java/Makefile.am2
-rw-r--r--tdehtml/tdemultipart/Makefile.am2
-rw-r--r--tdeinit/Makefile.am6
-rw-r--r--tdeio/Makefile.am2
-rw-r--r--tdeio/kpasswdserver/Makefile.am2
-rw-r--r--tdeio/misc/Makefile.am6
-rw-r--r--tdeio/misc/kpac/Makefile.am2
-rw-r--r--tdeio/misc/kssld/Makefile.am2
-rw-r--r--tdeio/misc/tdefile/Makefile.am2
-rw-r--r--tdeio/misc/tdentlm/Makefile.am2
-rw-r--r--tdeio/misc/tdesasl/Makefile.am2
-rw-r--r--tdeio/misc/tdesendbugmail/Makefile.am2
-rw-r--r--tdeio/misc/tdewalletd/Makefile.am2
-rw-r--r--tdeio/tdeioexec/Makefile.am2
-rw-r--r--tdeio/tests/Makefile.am2
-rw-r--r--tdeioslave/bzip2/Makefile.am2
-rw-r--r--tdeioslave/file/Makefile.am2
-rw-r--r--tdeioslave/ftp/Makefile.am2
-rw-r--r--tdeioslave/gzip/Makefile.am4
-rw-r--r--tdeioslave/http/Makefile.am4
-rw-r--r--tdeioslave/http/kcookiejar/Makefile.am4
-rw-r--r--tdeioslave/http/kcookiejar/tests/Makefile.am2
-rw-r--r--tdeioslave/iso/Makefile.am2
-rw-r--r--tdeioslave/metainfo/Makefile.am4
-rw-r--r--tdemdi/Makefile.am2
-rw-r--r--tdemdi/tdemdi/Makefile.am2
-rw-r--r--tdenewstuff/Makefile.am8
-rw-r--r--tdeparts/Makefile.am2
-rw-r--r--tdeprint/Makefile.am4
-rw-r--r--tdeprint/cups/Makefile.am4
-rw-r--r--tdeprint/cups/cupsdconf2/Makefile.am2
-rw-r--r--tdeprint/ext/Makefile.am2
-rw-r--r--tdeprint/lpdunix/Makefile.am2
-rw-r--r--tdeprint/lpr/Makefile.am2
-rw-r--r--tdeprint/management/Makefile.am6
-rw-r--r--tdeprint/rlpr/Makefile.am2
-rw-r--r--tdeprint/tools/escputil/Makefile.am2
-rw-r--r--tderandr/Makefile.am2
-rw-r--r--tderesources/Makefile.am6
-rw-r--r--tdespell2/plugins/aspell/Makefile.am2
-rw-r--r--tdespell2/plugins/hspell/Makefile.am2
-rw-r--r--tdespell2/plugins/ispell/Makefile.am2
-rw-r--r--tdespell2/ui/Makefile.am2
-rw-r--r--tdestyles/highcolor/Makefile.am2
-rw-r--r--tdestyles/highcontrast/Makefile.am2
-rw-r--r--tdestyles/highcontrast/config/Makefile.am2
-rw-r--r--tdestyles/keramik/Makefile.am4
-rw-r--r--tdestyles/kthemestyle/Makefile.am2
-rw-r--r--tdestyles/light/Makefile.am2
-rw-r--r--tdestyles/plastik/Makefile.am2
-rw-r--r--tdestyles/plastik/config/Makefile.am2
-rw-r--r--tdestyles/utils/installtheme/Makefile.am4
-rw-r--r--tdesu/Makefile.am2
-rw-r--r--tdeui/Makefile.am2
-rw-r--r--tdeui/kdetrayproxy/Makefile.am2
-rw-r--r--tdeunittest/Makefile.am4
-rw-r--r--tdeutils/Makefile.am2
-rw-r--r--tdewallet/backend/Makefile.am2
-rw-r--r--tdewallet/client/Makefile.am2
-rw-r--r--tdewallet/tests/Makefile.am6
-rw-r--r--tdewidgets/Makefile.am6
105 files changed, 187 insertions, 187 deletions
diff --git a/arts/kde/Makefile.am b/arts/kde/Makefile.am
index 0bcd464f..0a56cc56 100644
--- a/arts/kde/Makefile.am
+++ b/arts/kde/Makefile.am
@@ -8,7 +8,7 @@ libartskde_la_SOURCES = artskde.cc kioinputstream_impl.cpp kplayobject.cc \
kartsserver.cpp kdatarequest_impl.cpp kaudioconverter.cc \
kvideowidget.cpp kplayobjectcreator.cc \
kaudiomanagerplay.cpp
-libartskde_la_LIBADD = $(LIB_TDEIO) -lqtmcop -lsoundserver_idl -lartsflow_idl -lmcop $(LIB_QT) $(LIB_TDECORE) -lkmedia2_idl -lartsflow $(LIB_TDEUI) $(LIB_X11)
+libartskde_la_LIBADD = $(LIB_TDEIO) -lqtmcop -lsoundserver_idl -lartsflow_idl -lmcop $(LIB_TQT) $(LIB_TDECORE) -lkmedia2_idl -lartsflow $(LIB_TDEUI) $(LIB_X11)
libartskde_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
libartskde_la_METASOURCES = AUTO
libartskde_la_COMPILE_FIRST = artskde.h
diff --git a/arts/knotify/Makefile.am b/arts/knotify/Makefile.am
index 6d44285a..2041a0a5 100644
--- a/arts/knotify/Makefile.am
+++ b/arts/knotify/Makefile.am
@@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = knotify.la
knotify_la_SOURCES = knotify.cpp knotify.skel
if include_ARTS
-knotify_la_LIBADD = -lsoundserver_idl $(LIB_TDEUI) $(top_builddir)/arts/kde/libartskde.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) -lartsflow_idl -lmcop
+knotify_la_LIBADD = -lsoundserver_idl $(LIB_TDEUI) $(top_builddir)/arts/kde/libartskde.la $(LIB_TQT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) -lartsflow_idl -lmcop
endif
knotify_la_LDFLAGS = $(all_libraries) -module -avoid-version
knotify_la_METASOURCES = AUTO
@@ -15,7 +15,7 @@ knotify_la_METASOURCES = AUTO
check_PROGRAMS = knotifytest
knotifytest_SOURCES = knotifytest.cpp
knotifytest_LDADD = $(LIB_TDECORE)
-knotifytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+knotifytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
noinst_HEADERS = knotify.h
diff --git a/dcop/Makefile.am b/dcop/Makefile.am
index 34cd9870..65799391 100644
--- a/dcop/Makefile.am
+++ b/dcop/Makefile.am
@@ -30,7 +30,7 @@ bin_PROGRAMS = dcopserver_shutdown
check_PROGRAMS = testdcop testdcopc dcop_deadlock_test
lib_LTLIBRARIES = libDCOP.la
-libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_QT)
+libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_TQT)
libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 6:0:2 -no-undefined $(all_libraries)
libDCOP_la_NMCHECK = $(srcdir)/libDCOP.nmcheck
libDCOP_la_NMCHECKWEAK = $(srcdir)/libDCOP_weak.nmcheck $(top_srcdir)/tdecore/libqt-mt_weak.nmcheck
@@ -46,19 +46,19 @@ libDCOP_la_SOURCES = dcopstub.cpp dcopref.cpp dcopobject.cpp dcopclient.cpp
tdeinit_LTLIBRARIES = dcopserver.la
dcopserver_la_LDFLAGS = -module -avoid-version $(all_libraries)
dcopserver_la_SOURCES = dcopserver.cpp dcopsignals.cpp
-dcopserver_la_LIBADD = libDCOP.la $(LIB_QT)
+dcopserver_la_LIBADD = libDCOP.la $(LIB_TQT)
dcopserver_shutdown_SOURCES = dcopserver_shutdown.c
-testdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testdcop_SOURCES = testdcop.cpp
testdcop_LDADD = libDCOP.la
-dcop_deadlock_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+dcop_deadlock_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
dcop_deadlock_test_SOURCES = dcop_deadlock_test.cpp
dcop_deadlock_test_LDADD = ../tdecore/libtdecore.la
-testdcopc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testdcopc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testdcopc_SOURCES = testdcopc.c dcopc.c
testdcopc_LDADD = KDE-ICE/libkICE.la $(LIBSM)
diff --git a/dcop/client/Makefile.am b/dcop/client/Makefile.am
index bae7ddd2..1cda7764 100644
--- a/dcop/client/Makefile.am
+++ b/dcop/client/Makefile.am
@@ -8,19 +8,19 @@ DCOP_LIB = ../libDCOP.la
bin_PROGRAMS = dcop dcopfind dcopclient dcopobject dcopref dcopstart dcopquit
dcop_SOURCES = dcop.cpp
-dcop_LDADD = $(LIB_QT) $(DCOP_LIB)
+dcop_LDADD = $(LIB_TQT) $(DCOP_LIB)
dcop_LDFLAGS = $(KDE_RPATH)
dcopstart_SOURCES = dcopstart.cpp
-dcopstart_LDADD = $(LIB_QT) $(DCOP_LIB)
+dcopstart_LDADD = $(LIB_TQT) $(DCOP_LIB)
dcopstart_LDFLAGS = $(KDE_RPATH)
dcopquit_SOURCES = dcopquit.cpp
-dcopquit_LDADD = $(LIB_QT) $(DCOP_LIB)
+dcopquit_LDADD = $(LIB_TQT) $(DCOP_LIB)
dcopquit_LDFLAGS = $(KDE_RPATH)
dcopfind_SOURCES = dcopfind.cpp
-dcopfind_LDADD = $(LIB_QT) $(DCOP_LIB)
+dcopfind_LDADD = $(LIB_TQT) $(DCOP_LIB)
dcopfind_LDFLAGS = $(KDE_RPATH)
dcopclient_SOURCES = dcopclient.c
diff --git a/dcop/dcopidl/Makefile.am b/dcop/dcopidl/Makefile.am
index 2b07f5e0..d896a4a3 100644
--- a/dcop/dcopidl/Makefile.am
+++ b/dcop/dcopidl/Makefile.am
@@ -10,7 +10,7 @@ bin_PROGRAMS = dcopidl
dcopidl_SOURCES = main.cpp yacc.cc scanner.cc
noinst_HEADERS = yacc.cc.h
-dcopidl_LDADD = $(LIB_QT)
+dcopidl_LDADD = $(LIB_TQT)
dcopidl_LDFLAGS = $(KDE_RPATH) $(AM_LDFLAGS)
####### Build rules
diff --git a/dcop/dcopidl2cpp/Makefile.am b/dcop/dcopidl2cpp/Makefile.am
index 9b9a6b59..2db93bd5 100644
--- a/dcop/dcopidl2cpp/Makefile.am
+++ b/dcop/dcopidl2cpp/Makefile.am
@@ -9,7 +9,7 @@ bin_PROGRAMS = dcopidl2cpp
dcopidl2cpp_SOURCES = main.cpp skel.cpp stub.cpp stubimpl.cpp
noinst_HEADERS = main.h
-dcopidl2cpp_LDADD = $(LIB_QT)
+dcopidl2cpp_LDADD = $(LIB_TQT)
dcopidl2cpp_LDFLAGS = $(KDE_RPATH) $(AM_LDFLAGS)
dcopidl_output.kidl: ../dcopidl/dcopidl $(srcdir)/dcopidl_test.h
diff --git a/dnssd/Makefile.am b/dnssd/Makefile.am
index 25e749d7..6c991505 100644
--- a/dnssd/Makefile.am
+++ b/dnssd/Makefile.am
@@ -14,7 +14,7 @@ libtdednssd_la_SOURCES = remoteservice.cpp responder.cpp servicebase.cpp \
dnssdincludedir = $(includedir)/dnssd
dnssdinclude_HEADERS = domainbrowser.h query.h remoteservice.h \
publicservice.h servicebase.h servicebrowser.h settings.h
-libtdednssd_la_LIBADD = ../tdecore/libtdecore.la $(AVAHI_LIBS) $(LIB_QT)
+libtdednssd_la_LIBADD = ../tdecore/libtdecore.la $(AVAHI_LIBS) $(LIB_TQT)
libtdednssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
#kde_kcfg_DATA = kcm_tdednssd.kcfg
diff --git a/interfaces/tdeimproxy/library/Makefile.am b/interfaces/tdeimproxy/library/Makefile.am
index bae476b1..c7df3da5 100644
--- a/interfaces/tdeimproxy/library/Makefile.am
+++ b/interfaces/tdeimproxy/library/Makefile.am
@@ -16,7 +16,7 @@ tdeimproxyinclude_HEADERS = tdeimproxy.h tdeimproxyiface.h
lib_LTLIBRARIES = libtdeimproxy.la
libtdeimproxy_la_LDFLAGS = -no-undefined $(all_libraries)
-libtdeimproxy_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI)
+libtdeimproxy_la_LIBADD = $(LIB_TDEIO) $(LIB_TQT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI)
libtdeimproxy_la_SOURCES = tdeimproxy.cpp kimiface.stub tdeimproxyiface.skel
kimiface_DIR = $(top_srcdir)/interfaces/tdeimproxy/interface
diff --git a/interfaces/tdemediaplayer/Makefile.am b/interfaces/tdemediaplayer/Makefile.am
index 289668b2..ab5da5dd 100644
--- a/interfaces/tdemediaplayer/Makefile.am
+++ b/interfaces/tdemediaplayer/Makefile.am
@@ -9,7 +9,7 @@ lib_LTLIBRARIES = libtdemediaplayer.la
libtdemediaplayer_la_SOURCES = player.cpp playerdcopobject.skel view.cpp
libtdemediaplayer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
-libtdemediaplayer_la_LIBADD = $(LIB_TDEPARTS) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE)
+libtdemediaplayer_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TQT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE)
libtdemediaplayer_la_METASOURCES = AUTO
tdemediaplayerinclude_HEADERS = player.h playerdcopobject.h view.h
diff --git a/interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am b/interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am
index cefc9e20..6c5b6741 100644
--- a/interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am
+++ b/interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = tdefileaudiopreview.la
tdefileaudiopreview_la_SOURCES = tdefileaudiopreview.cpp
tdefileaudiopreview_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
-tdefileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/tdemediaplayer/libtdemediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE)
+tdefileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/tdemediaplayer/libtdemediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_TDEIO) $(LIB_TQT) $(LIB_TDECORE)
noinst_HEADERS = tdefileaudiopreview.h
diff --git a/interfaces/tdescript/Makefile.am b/interfaces/tdescript/Makefile.am
index 97ff6c9b..a639e306 100644
--- a/interfaces/tdescript/Makefile.am
+++ b/interfaces/tdescript/Makefile.am
@@ -5,12 +5,12 @@ INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. $(al
#lib_LTLIBRARIES = libtdescriptloader.la libtdescript.la
lib_LTLIBRARIES = libtdescript.la
#libtdescriptloader_la_SOURCES = scriptloader.cpp
-#libtdescriptloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+#libtdescriptloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
#libtdescriptloader_la_LIBADD = $(LIB_TDEPARTS)
libtdescript_la_SOURCES = scriptmanager.cpp
libtdescript_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
-libtdescript_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
+libtdescript_la_LIBADD = $(LIB_TDEIO) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI)
tdescriptinclude_HEADERS = scriptinterface.h scriptclientinterface.h scriptmanager.h
tdescriptincludedir = $(includedir)
diff --git a/interfaces/tdescript/sample/Makefile.am b/interfaces/tdescript/sample/Makefile.am
index e20854c7..7489de19 100644
--- a/interfaces/tdescript/sample/Makefile.am
+++ b/interfaces/tdescript/sample/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libshellscript.la
libshellscript_la_SOURCES = shellscript.cpp
libshellscript_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined -avoid-version
-libshellscript_la_LIBADD = ../libtdescript.la $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la
+libshellscript_la_LIBADD = ../libtdescript.la $(LIB_TQT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la
METASOURCES = AUTO
diff --git a/interfaces/tdetexteditor/Makefile.am b/interfaces/tdetexteditor/Makefile.am
index ac071732..65b0ad86 100644
--- a/interfaces/tdetexteditor/Makefile.am
+++ b/interfaces/tdetexteditor/Makefile.am
@@ -22,8 +22,8 @@ libtdetexteditor_la_SOURCES = tdetexteditor.cpp \
texthintinterface.cpp editinterfaceext.cpp variableinterface.cpp templateinterface.cpp
-libtdetexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-libtdetexteditor_la_LIBADD = $(LIB_TDEPARTS) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEABC) $(LIB_TDECORE) $(LIB_QT) $(LIB_TDEFILE) $(LIB_TDEUI)
+libtdetexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+libtdetexteditor_la_LIBADD = $(LIB_TDEPARTS) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEABC) $(LIB_TDECORE) $(LIB_TQT) $(LIB_TDEFILE) $(LIB_TDEUI)
tdetexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface.h undointerface.h \
selectioninterface.h cursorinterface.h \
diff --git a/interfaces/terminal/test/Makefile.am b/interfaces/terminal/test/Makefile.am
index 7570f6d2..03a04301 100644
--- a/interfaces/terminal/test/Makefile.am
+++ b/interfaces/terminal/test/Makefile.am
@@ -1,6 +1,6 @@
INCLUDES=$(all_includes)
check_PROGRAMS=test
test_SOURCES=main.cc
-test_LDADD=$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio
+test_LDADD=$(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio
test_LDFLAGS=$(all_libraries)
METASOURCES=AUTO
diff --git a/kate/interfaces/Makefile.am b/kate/interfaces/Makefile.am
index 1d910203..f430c87c 100644
--- a/kate/interfaces/Makefile.am
+++ b/kate/interfaces/Makefile.am
@@ -3,7 +3,7 @@ METASOURCES = document.moc view.moc
lib_LTLIBRARIES = libkatepartinterfaces.la
libkatepartinterfaces_la_SOURCES = interfaces.cpp katecmd.cpp
-libkatepartinterfaces_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDECORE)
+libkatepartinterfaces_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_TQT) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDECORE)
libkatepartinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
kateinclude_HEADERS = document.h view.h
diff --git a/kate/part/Makefile.am b/kate/part/Makefile.am
index 276abf53..34042ddb 100644
--- a/kate/part/Makefile.am
+++ b/kate/part/Makefile.am
@@ -16,7 +16,7 @@ libkate_la_SOURCES = katesearch.cpp katebuffer.cpp katecmds.cpp \
libkatepart_la_SOURCES = dummy.cpp
-libkatepart_la_LIBADD = libkate.la ../interfaces/libkatepartinterfaces.la $(LIB_TDEPRINT) $(top_builddir)/tdeutils/libtdeutils.la $(top_builddir)/kjs/libkjs.la $(LUA_LIBS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEPARTS) $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_TDEFILE) $(top_builddir)/dcop/libDCOP.la
+libkatepart_la_LIBADD = libkate.la ../interfaces/libkatepartinterfaces.la $(LIB_TDEPRINT) $(top_builddir)/tdeutils/libtdeutils.la $(top_builddir)/kjs/libkjs.la $(LUA_LIBS) $(LIB_TQT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEPARTS) $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_TDEFILE) $(top_builddir)/dcop/libDCOP.la
libkatepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
diff --git a/kate/plugins/insertfile/Makefile.am b/kate/plugins/insertfile/Makefile.am
index 4a89ef3a..721cc60a 100644
--- a/kate/plugins/insertfile/Makefile.am
+++ b/kate/plugins/insertfile/Makefile.am
@@ -5,7 +5,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = tdetexteditor_insertfile.la
tdetexteditor_insertfile_la_SOURCES = insertfileplugin.cpp
-tdetexteditor_insertfile_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEFILE) $(LIB_TDEUI)
+tdetexteditor_insertfile_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEFILE) $(LIB_TDEUI)
tdetexteditor_insertfile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
insertfiledatadir = $(kde_datadir)/tdetexteditor_insertfile
diff --git a/kate/plugins/isearch/Makefile.am b/kate/plugins/isearch/Makefile.am
index cc935695..07aad0f4 100644
--- a/kate/plugins/isearch/Makefile.am
+++ b/kate/plugins/isearch/Makefile.am
@@ -5,7 +5,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = tdetexteditor_isearch.la
tdetexteditor_isearch_la_SOURCES = ISearchPlugin.cpp
-tdetexteditor_isearch_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
+tdetexteditor_isearch_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI)
tdetexteditor_isearch_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
isearchdatadir = $(kde_datadir)/tdetexteditor_isearch
diff --git a/kate/plugins/kdatatool/Makefile.am b/kate/plugins/kdatatool/Makefile.am
index a0317d97..00842592 100644
--- a/kate/plugins/kdatatool/Makefile.am
+++ b/kate/plugins/kdatatool/Makefile.am
@@ -5,7 +5,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = tdetexteditor_kdatatool.la
tdetexteditor_kdatatool_la_SOURCES = kate_kdatatool.cpp
-tdetexteditor_kdatatool_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEFILE) $(LIB_TDEUI)
+tdetexteditor_kdatatool_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEFILE) $(LIB_TDEUI)
tdetexteditor_kdatatool_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
kdatatooldatadir = $(kde_datadir)/tdetexteditor_kdatatool
diff --git a/kate/plugins/wordcompletion/Makefile.am b/kate/plugins/wordcompletion/Makefile.am
index 1fd67eaf..44468181 100644
--- a/kate/plugins/wordcompletion/Makefile.am
+++ b/kate/plugins/wordcompletion/Makefile.am
@@ -5,7 +5,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = tdetexteditor_docwordcompletion.la
tdetexteditor_docwordcompletion_la_SOURCES = docwordcompletion.cpp
-tdetexteditor_docwordcompletion_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
+tdetexteditor_docwordcompletion_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI)
tdetexteditor_docwordcompletion_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
docwordcompletiondatadir = $(kde_datadir)/tdetexteditor_docwordcompletion
diff --git a/kded/Makefile.am b/kded/Makefile.am
index e192e098..f04ae32a 100644
--- a/kded/Makefile.am
+++ b/kded/Makefile.am
@@ -23,11 +23,11 @@ lib_LTLIBRARIES =
tdeinit_LTLIBRARIES = kded.la tdebuildsycoca.la
kded_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
+kded_la_LIBADD = $(LIB_TDEIO) $(LIB_TQT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
kded_la_SOURCES = kded.cpp kdedmodule.cpp
tdebuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version
-tdebuildsycoca_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
+tdebuildsycoca_la_LIBADD = $(LIB_TDEIO) $(LIB_TQT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
tdebuildsycoca_la_SOURCES = tdebuildsycoca.cpp kbuildservicetypefactory.cpp \
kbuildservicefactory.cpp \
kbuildservicegroupfactory.cpp \
@@ -38,15 +38,15 @@ tdebuildsycoca_la_SOURCES = tdebuildsycoca.cpp kbuildservicetypefactory.cpp \
bin_PROGRAMS = kdontchangethehostname tde-menu tdemimelist
-kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kdontchangethehostname_LDADD = $(LIB_TDECORE)
kdontchangethehostname_SOURCES = khostname.cpp
-tdemimelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdemimelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
tdemimelist_LDADD = ../tdeio/libtdeio.la
tdemimelist_SOURCES = tdemimelist.cpp
-kde_menu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kde_menu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kde_menu_LDADD = $(LIB_TDEIO)
kde_menu_SOURCES = tde-menu.cpp
diff --git a/kdoctools/Makefile.am b/kdoctools/Makefile.am
index b1202e05..6ea27000 100644
--- a/kdoctools/Makefile.am
+++ b/kdoctools/Makefile.am
@@ -11,11 +11,11 @@ libkbzipfilter_dummy_la_SOURCES = kbzip2filter.cpp
kde_module_LTLIBRARIES = tdeio_help.la tdeio_ghelp.la
tdeio_help_la_SOURCES = tdeio_help.cpp main.cpp xslt.cpp
-tdeio_help_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS) libkbzipfilter_dummy.la $(LIB_TDEIO) $(LIBBZ2) $(LIB_QT) $(LIB_TDECORE)
+tdeio_help_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS) libkbzipfilter_dummy.la $(LIB_TDEIO) $(LIBBZ2) $(LIB_TQT) $(LIB_TDECORE)
tdeio_help_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
tdeio_ghelp_la_SOURCES = tdeio_help.cpp main_ghelp.cpp xslt.cpp
-tdeio_ghelp_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS) libkbzipfilter_dummy.la $(LIB_TDEIO) $(LIBBZ2) $(LIB_QT) $(LIB_TDECORE)
+tdeio_ghelp_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS) libkbzipfilter_dummy.la $(LIB_TDEIO) $(LIBBZ2) $(LIB_TQT) $(LIB_TDECORE)
tdeio_ghelp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = tdeio_help.h
diff --git a/kimgio/Makefile.am b/kimgio/Makefile.am
index 41ca9a89..88f32b15 100644
--- a/kimgio/Makefile.am
+++ b/kimgio/Makefile.am
@@ -25,7 +25,7 @@ KIMGIO_PLUGIN = -avoid-version -export-symbols-regex 'kimgio_.*_(read|write)'
kimg_tiff_la_SOURCES = tiffr.cpp
kimg_tiff_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-kimg_tiff_la_LIBADD = $(LIBTIFF) $(LIB_QT)
+kimg_tiff_la_LIBADD = $(LIBTIFF) $(LIB_TQT)
#kimg_g3_la_SOURCES = g3r.cpp
#kimg_g3_la_LDFLAGS = -module $(USER_LDFLAGS) $(KIMGIO_PLUGIN) -no-undefined
@@ -33,51 +33,51 @@ kimg_tiff_la_LIBADD = $(LIBTIFF) $(LIB_QT)
kimg_xview_la_SOURCES = xview.cpp
kimg_xview_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-kimg_xview_la_LIBADD = $(LIB_QT)
+kimg_xview_la_LIBADD = $(LIB_TQT)
kimg_eps_la_SOURCES = eps.cpp
kimg_eps_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-kimg_eps_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
+kimg_eps_la_LIBADD = $(LIB_TDECORE) $(LIB_TQT)
kimg_ico_la_SOURCES = ico.cpp
kimg_ico_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-kimg_ico_la_LIBADD = $(LIB_QT)
+kimg_ico_la_LIBADD = $(LIB_TQT)
kimg_jp2_la_SOURCES = jp2.cpp
kimg_jp2_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-kimg_jp2_la_LIBADD = $(LIB_QT) $(LIB_JASPER) ../tdecore/libtdecore.la
+kimg_jp2_la_LIBADD = $(LIB_TQT) $(LIB_JASPER) ../tdecore/libtdecore.la
kimg_pcx_la_SOURCES = pcx.cpp
kimg_pcx_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-kimg_pcx_la_LIBADD = $(LIB_QT)
+kimg_pcx_la_LIBADD = $(LIB_TQT)
kimg_tga_la_SOURCES = tga.cpp
kimg_tga_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-kimg_tga_la_LIBADD = $(LIB_QT)
+kimg_tga_la_LIBADD = $(LIB_TQT)
kimg_rgb_la_SOURCES = rgb.cpp
kimg_rgb_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-kimg_rgb_la_LIBADD = $(LIB_QT)
+kimg_rgb_la_LIBADD = $(LIB_TQT)
kimg_xcf_la_SOURCES = xcf.cpp
kimg_xcf_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-kimg_xcf_la_LIBADD = $(LIB_QT)
+kimg_xcf_la_LIBADD = $(LIB_TQT)
kimg_exr_la_SOURCES = exr.cpp
kimg_exr_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-kimg_exr_la_LIBADD = $(LIB_QT) $(LIB_EXR)
+kimg_exr_la_LIBADD = $(LIB_TQT) $(LIB_EXR)
kimg_dds_la_SOURCES = dds.cpp
kimg_dds_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-kimg_dds_la_LIBADD = $(LIB_QT)
+kimg_dds_la_LIBADD = $(LIB_TQT)
kimg_psd_la_SOURCES = psd.cpp
kimg_psd_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-kimg_psd_la_LIBADD = $(LIB_QT)
+kimg_psd_la_LIBADD = $(LIB_TQT)
kimg_hdr_la_SOURCES = hdr.cpp
kimg_hdr_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-kimg_hdr_la_LIBADD = $(LIB_QT)
+kimg_hdr_la_LIBADD = $(LIB_TQT)
noinst_HEADERS= xview.h eps.h tiffr.h g3r.h ico.h jp2.h pcx.h tga.h rgb.h xcf.h gimp.h exr.h dds.h psd.h hdr.h
diff --git a/libtdemid/Makefile.am b/libtdemid/Makefile.am
index 9616de31..8cb347b0 100644
--- a/libtdemid/Makefile.am
+++ b/libtdemid/Makefile.am
@@ -18,7 +18,7 @@ libtdemid_la_SOURCES = midiout.cc player.cc track.cc midimapper.cc \
libtdemid.cc
libtdemid_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 0:95 -no-undefined
-libtdemid_la_LIBADD = $(LIBASOUND) ../tdecore/libtdecore.la $(LIB_QT)
+libtdemid_la_LIBADD = $(LIBASOUND) ../tdecore/libtdecore.la $(LIB_TQT)
DOXYGEN_REFERENCES = tdecore
include ../admin/Doxyfile.am
diff --git a/libtdescreensaver/Makefile.am b/libtdescreensaver/Makefile.am
index 8f7a6104..2b0513b3 100644
--- a/libtdescreensaver/Makefile.am
+++ b/libtdescreensaver/Makefile.am
@@ -1,6 +1,6 @@
lib_LTLIBRARIES = libtdescreensaver.la
libtdescreensaver_la_SOURCES = main.cpp tdescreensaver.cpp
-libtdescreensaver_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_X11)
+libtdescreensaver_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_X11)
if undefined_symbols_allowed
libtdescreensaver_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 6:0:2
else
diff --git a/pics/Makefile.am b/pics/Makefile.am
index 0e93da6b..ccac65db 100644
--- a/pics/Makefile.am
+++ b/pics/Makefile.am
@@ -10,7 +10,7 @@ bin_PROGRAMS = $(KSVGTOPNG)
ksvgtopng_SOURCES = ksvgtopng.cpp
ksvgtopng_LDADD = $(LIB_TDECORE) $(top_builddir)/tdecore/svgicons/libkdesvgicons.la
-ksvgtopng_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+ksvgtopng_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
install-data-local:
-rm -f $(DESTDIR)$(kde_icondir)/default.tde
diff --git a/tdeabc/Makefile.am b/tdeabc/Makefile.am
index 288e6101..599c94dc 100644
--- a/tdeabc/Makefile.am
+++ b/tdeabc/Makefile.am
@@ -22,7 +22,7 @@ CLEANFILES = addressee.h addressee.cpp field.cpp
lib_LTLIBRARIES = libtdeabc.la
libtdeabc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 3:0:2 -no-undefined
libtdeabc_la_LIBADD = vcard/libvcard.la vcardparser/libvcards.la $(LIB_TDEIO) \
- $(top_builddir)/tderesources/libtderesources.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE)
+ $(top_builddir)/tderesources/libtderesources.la $(LIB_TQT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE)
libtdeabc_la_COMPILE_FIRST = addressee.h
libtdeabc_la_SOURCES = \
@@ -52,7 +52,7 @@ METASOURCES = AUTO
bin_PROGRAMS = tdeab2tdeabc
-tdeab2tdeabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdeab2tdeabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
tdeab2tdeabc_LDADD = libtdeabc.la ../kab/libkab.la
tdeab2tdeabc_SOURCES = tdeab2tdeabc.cpp
diff --git a/tdeabc/formats/Makefile.am b/tdeabc/formats/Makefile.am
index e96ff820..f586e155 100644
--- a/tdeabc/formats/Makefile.am
+++ b/tdeabc/formats/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = tdeabcformat_binary.la
tdeabcformat_binary_la_SOURCES = binaryformat.cpp
tdeabcformat_binary_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
-no-undefined
-tdeabcformat_binary_la_LIBADD = $(LIB_TDEABC) $(LIB_QT) $(LIB_TDECORE)
+tdeabcformat_binary_la_LIBADD = $(LIB_TDEABC) $(LIB_TQT) $(LIB_TDECORE)
tdeabcformat_binary_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
# these are the headers for your project
diff --git a/tdeabc/plugins/dir/Makefile.am b/tdeabc/plugins/dir/Makefile.am
index 95fcfe2c..ac65444c 100644
--- a/tdeabc/plugins/dir/Makefile.am
+++ b/tdeabc/plugins/dir/Makefile.am
@@ -6,13 +6,13 @@ noinst_HEADERS = resourcedirconfig.h
lib_LTLIBRARIES = libtdeabc_dir.la
libtdeabc_dir_la_SOURCES = resourcedir.cpp resourcedirconfig.cpp
libtdeabc_dir_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
-libtdeabc_dir_la_LIBADD = $(LIB_TDEABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDECORE) $(LIB_TDEFILE) $(LIB_TDEUI)
+libtdeabc_dir_la_LIBADD = $(LIB_TDEABC) $(LIB_TQT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDECORE) $(LIB_TDEFILE) $(LIB_TDEUI)
libtdeabc_dir_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
kde_module_LTLIBRARIES = tdeabc_dir.la
tdeabc_dir_la_SOURCES = resourcedirplugin.cpp
tdeabc_dir_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-tdeabc_dir_la_LIBADD = libtdeabc_dir.la $(LIB_QT) $(LIB_TDECORE)
+tdeabc_dir_la_LIBADD = libtdeabc_dir.la $(LIB_TQT) $(LIB_TDECORE)
METASOURCES = AUTO
diff --git a/tdeabc/plugins/file/Makefile.am b/tdeabc/plugins/file/Makefile.am
index beda9a00..247d1909 100644
--- a/tdeabc/plugins/file/Makefile.am
+++ b/tdeabc/plugins/file/Makefile.am
@@ -6,14 +6,14 @@ noinst_HEADERS = resourcefileconfig.h
lib_LTLIBRARIES = libtdeabc_file.la
libtdeabc_file_la_SOURCES = resourcefile.cpp resourcefileconfig.cpp
libtdeabc_file_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
-libtdeabc_file_la_LIBADD = $(LIB_TDEABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEFILE) $(LIB_TDECORE) $(LIB_TDEUI)
+libtdeabc_file_la_LIBADD = $(LIB_TDEABC) $(LIB_TQT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEFILE) $(LIB_TDECORE) $(LIB_TDEUI)
libtdeabc_file_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
kde_module_LTLIBRARIES = tdeabc_file.la
tdeabc_file_la_SOURCES = resourcefileplugin.cpp
tdeabc_file_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-tdeabc_file_la_LIBADD = libtdeabc_file.la $(LIB_QT) $(LIB_TDECORE)
+tdeabc_file_la_LIBADD = libtdeabc_file.la $(LIB_TQT) $(LIB_TDECORE)
tdeabc_file_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
METASOURCES = AUTO
diff --git a/tdeabc/plugins/ldaptdeio/Makefile.am b/tdeabc/plugins/ldaptdeio/Makefile.am
index 085bf771..491fcd23 100644
--- a/tdeabc/plugins/ldaptdeio/Makefile.am
+++ b/tdeabc/plugins/ldaptdeio/Makefile.am
@@ -6,13 +6,13 @@ noinst_HEADERS = resourceldaptdeioconfig.h
lib_LTLIBRARIES = libtdeabc_ldaptdeio.la
libtdeabc_ldaptdeio_la_SOURCES = resourceldaptdeio.cpp resourceldaptdeioconfig.cpp
libtdeabc_ldaptdeio_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
-libtdeabc_ldaptdeio_la_LIBADD = $(LIB_TDEABC) $(LIB_TDEIO) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEUI) $(LIB_TDECORE)
+libtdeabc_ldaptdeio_la_LIBADD = $(LIB_TDEABC) $(LIB_TDEIO) $(LIB_TQT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEUI) $(LIB_TDECORE)
libtdeabc_ldaptdeio_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
kde_module_LTLIBRARIES = tdeabc_ldaptdeio.la
tdeabc_ldaptdeio_la_SOURCES = resourceldaptdeioplugin.cpp
tdeabc_ldaptdeio_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-tdeabc_ldaptdeio_la_LIBADD = libtdeabc_ldaptdeio.la $(LIB_QT) $(LIB_TDECORE)
+tdeabc_ldaptdeio_la_LIBADD = libtdeabc_ldaptdeio.la $(LIB_TQT) $(LIB_TDECORE)
METASOURCES = AUTO
diff --git a/tdeabc/plugins/net/Makefile.am b/tdeabc/plugins/net/Makefile.am
index e738d55e..ddfbd657 100644
--- a/tdeabc/plugins/net/Makefile.am
+++ b/tdeabc/plugins/net/Makefile.am
@@ -11,7 +11,7 @@ libtdeabc_net_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
kde_module_LTLIBRARIES = tdeabc_net.la
tdeabc_net_la_SOURCES = resourcenetplugin.cpp
-tdeabc_net_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -L../../../tdecore/.libs/ -ltdecore
+tdeabc_net_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -L../../../tdecore/.libs/ -ltdecore
tdeabc_net_la_LIBADD = libtdeabc_net.la
METASOURCES = AUTO
diff --git a/tdeabc/tests/Makefile.am b/tdeabc/tests/Makefile.am
index b43162fd..53f76b15 100644
--- a/tdeabc/tests/Makefile.am
+++ b/tdeabc/tests/Makefile.am
@@ -12,44 +12,44 @@ check_PROGRAMS = testlock testldapclient
testlock_LDFLAGS = $(all_libraries)
testlock_SOURCES = testlock.cpp
-testldapclient_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testldapclient_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testldapclient_SOURCES = testldapclient.cpp
EXTRA_PROGRAMS = testkabc testkabcdlg testdistlist bigread bigwrite testdb \
testaddressee testaddresseelist testaddressfmt tdeabcargl testaddresslineedit
-testtdeabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testtdeabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testtdeabc_SOURCES = testkabc.cpp
-testaddressee_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testaddressee_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testaddressee_SOURCES = testaddressee.cpp
-testaddresseelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testaddresseelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testaddresseelist_SOURCES = testaddresseelist.cpp
-testaddressfmt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testaddressfmt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testaddressfmt_SOURCES = testaddressfmt.cpp
-testkabcdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testkabcdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testkabcdlg_SOURCES = testkabcdlg.cpp
-testdistlist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testdistlist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testdistlist_SOURCES = testdistlist.cpp
-testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testaddresslineedit_SOURCES = testaddresslineedit.cpp
-bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
bigread_LDADD = ../libtdeabc.la $(top_builddir)/tdeabc/plugins/file/libtdeabc_file.la
bigread_SOURCES = bigread.cpp
-bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
bigwrite_LDADD = ../libtdeabc.la $(top_builddir)/tdeabc/plugins/file/libtdeabc_file.la
bigwrite_SOURCES = bigwrite.cpp
-testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testdb_SOURCES = testdb.cpp
-kabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kabcargl_SOURCES = kabcargl.cpp
diff --git a/tdeabc/vcard/Makefile.am b/tdeabc/vcard/Makefile.am
index 35b31f5e..5807f25d 100644
--- a/tdeabc/vcard/Makefile.am
+++ b/tdeabc/vcard/Makefile.am
@@ -8,14 +8,14 @@ lib_LTLIBRARIES = libvcard.la
libvcard_la_SOURCES = vCard-all.cpp
libvcard_la_LDFLAGS = $(all_libraries)
-libvcard_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
+libvcard_la_LIBADD = $(LIB_TDECORE) $(LIB_TQT)
check_PROGRAMS = testwrite testread
-testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testwrite_LDADD = libvcard.la
testwrite_SOURCES = testwrite.cpp
-testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testread_LDADD = libvcard.la
testread_SOURCES = testread.cpp
diff --git a/tdeabc/vcardparser/Makefile.am b/tdeabc/vcardparser/Makefile.am
index 556344ef..04e4d0f4 100644
--- a/tdeabc/vcardparser/Makefile.am
+++ b/tdeabc/vcardparser/Makefile.am
@@ -8,15 +8,15 @@ vcardsinclude_HEADERS = vcard.h vcardline.h vcardparser.h
check_PROGRAMS = testread testwrite testread2
-testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testread_LDADD = libvcards.la $(top_builddir)/tdeabc/libtdeabc.la
testread_SOURCES = testread.cpp
-testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testread2_LDADD = libvcards.la $(top_builddir)/tdeabc/libtdeabc.la
testread2_SOURCES = testread2.cpp testutils.cpp
-testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testwrite_LDADD = libvcards.la $(top_builddir)/tdeabc/libtdeabc.la
testwrite_SOURCES = testwrite.cpp
diff --git a/tdecert/Makefile.am b/tdecert/Makefile.am
index e190b83d..a98232be 100644
--- a/tdecert/Makefile.am
+++ b/tdecert/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = libtdecertpart.la
libtdecertpart_la_SOURCES = tdecertpart.cc
libtdecertpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
-libtdecertpart_la_LIBADD = $(LIB_TDEPARTS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDEFILE) $(LIB_TDECORE)
+libtdecertpart_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TQT) $(LIB_TDEUI) $(LIB_TDEFILE) $(LIB_TDECORE)
libtdecertpart_la_DEPENDENCIES = $(LIB_TDEPARTS)
libtdecertpart_la_METASOURCES = AUTO
diff --git a/tdecmshell/Makefile.am b/tdecmshell/Makefile.am
index b5e18e1f..d0de3ac5 100644
--- a/tdecmshell/Makefile.am
+++ b/tdecmshell/Makefile.am
@@ -26,7 +26,7 @@ bin_PROGRAMS =
tdeinit_LTLIBRARIES = tdecmshell.la
tdecmshell_la_SOURCES = main.cpp main.skel
-tdecmshell_la_LIBADD = ../tdeutils/libtdeutils.la $(LIB_QT) $(LIB_TDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_TDEFILE)
+tdecmshell_la_LIBADD = ../tdeutils/libtdeutils.la $(LIB_TQT) $(LIB_TDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_TDEFILE)
tdecmshell_la_LDFLAGS = $(all_libraries) -module -avoid-version
noinst_HEADERS = main.h
diff --git a/tdeconf_update/Makefile.am b/tdeconf_update/Makefile.am
index 9041aad8..9b73906b 100644
--- a/tdeconf_update/Makefile.am
+++ b/tdeconf_update/Makefile.am
@@ -23,7 +23,7 @@ lib_LTLIBRARIES =
tdeinit_LTLIBRARIES = tdeconf_update.la
tdeconf_update_la_SOURCES = tdeconf_update.cpp
-tdeconf_update_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
+tdeconf_update_la_LIBADD = $(LIB_TDECORE) $(LIB_TQT)
tdeconf_update_la_LDFLAGS = $(all_libraries) -module -avoid-version
METASOURCES = AUTO
diff --git a/tdecore/Makefile.am b/tdecore/Makefile.am
index 4e3603f4..3d267eb9 100644
--- a/tdecore/Makefile.am
+++ b/tdecore/Makefile.am
@@ -123,7 +123,7 @@ libtdecore_la_SOURCES = libintl.cpp tdeapplication.cpp \
libtdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
libtdecore_la_LIBADD = malloc/libklmalloc.la network/libtdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la \
- $(LIBART_LIBS) $(LIB_IDN) $(top_builddir)/tdefx/libtdefx.la $(LIB_QT) $(LIBSM) $(LIB_X11) $(LIBZ) $(LIBDL)
+ $(LIBART_LIBS) $(LIB_IDN) $(top_builddir)/tdefx/libtdefx.la $(LIB_TQT) $(LIBSM) $(LIB_X11) $(LIBZ) $(LIBDL)
libtdecore_la_NMCHECK = $(srcdir)/libtdecore.nmcheck
libtdecore_la_NMCHECKWEAK = $(srcdir)/libtdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \
$(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/tdecore/standard_weak.nmcheck
diff --git a/tdecore/tdeconfig_compiler/Makefile.am b/tdecore/tdeconfig_compiler/Makefile.am
index ba622d6f..1ca17a12 100644
--- a/tdecore/tdeconfig_compiler/Makefile.am
+++ b/tdecore/tdeconfig_compiler/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes)
bin_PROGRAMS = tdeconfig_compiler
-tdeconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdeconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
tdeconfig_compiler_LDADD = $(LIB_TDECORE)
tdeconfig_compiler_SOURCES = tdeconfig_compiler.cpp
diff --git a/tdecore/tdeconfig_compiler/example/Makefile.am b/tdecore/tdeconfig_compiler/example/Makefile.am
index da7aecc9..a19ff6e3 100644
--- a/tdecore/tdeconfig_compiler/example/Makefile.am
+++ b/tdecore/tdeconfig_compiler/example/Makefile.am
@@ -3,11 +3,11 @@ AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes)
check_PROGRAMS = example # autoexample
EXTRA_PROGRAMS = autoexample
-example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
example_LDADD = $(LIB_TDECORE)
example_SOURCES = example.cpp exampleprefs_base.cpp
-autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
autoexample_LDADD = $(LIB_TDECORE) $(LIB_TDEUI)
autoexample_SOURCES = exampleprefs_base.cpp general_base.ui myoptions_base.ui \
autoexample.cpp
diff --git a/tdecore/tdeconfig_compiler/tests/Makefile.am b/tdecore/tdeconfig_compiler/tests/Makefile.am
index e82db353..ee0e95af 100644
--- a/tdecore/tdeconfig_compiler/tests/Makefile.am
+++ b/tdecore/tdeconfig_compiler/tests/Makefile.am
@@ -14,43 +14,43 @@ CLEANFILES = test1.cpp test1.h \
test_dpointer.cpp test_dpointer.h \
md5sums
-test1_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+test1_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
test1_LDADD = $(LIB_TDECORE)
test1_SOURCES = test1main.cpp test1.cpp
-test2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+test2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
test2_LDADD = $(LIB_TDECORE)
test2_SOURCES = test2main.cpp test2.cpp
-test3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+test3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
test3_LDADD = $(LIB_TDECORE)
test3_SOURCES = test3main.cpp test3.cpp
-test4_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+test4_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
test4_LDADD = $(LIB_TDECORE)
test4_SOURCES = test4main.cpp test4.cpp
-test5_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+test5_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
test5_LDADD = $(LIB_TDECORE)
test5_SOURCES = test5main.cpp test5.cpp
-test6_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+test6_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
test6_LDADD = $(LIB_TDECORE)
test6_SOURCES = test6main.cpp test6.cpp
-test7_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+test7_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
test7_LDADD = $(LIB_TDECORE)
test7_SOURCES = test7main.cpp test7.cpp
-test8_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+test8_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
test8_LDADD = $(LIB_TDECORE)
test8_SOURCES = test8main.cpp test8a.cpp test8b.cpp
-test9_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+test9_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
test9_LDADD = $(LIB_TDECORE)
test9_SOURCES = test9main.cpp test9.cpp
-test_dpointer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+test_dpointer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
test_dpointer_LDADD = $(LIB_TDECORE)
test_dpointer_SOURCES = test_dpointer_main.cpp test_dpointer.cpp
diff --git a/tdefx/Makefile.am b/tdefx/Makefile.am
index 7fb97e40..b77b8292 100644
--- a/tdefx/Makefile.am
+++ b/tdefx/Makefile.am
@@ -24,7 +24,7 @@ INCLUDES= $(all_includes)
lib_LTLIBRARIES = libtdefx.la
libtdefx_la_LDFLAGS = $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(all_libraries) -no-undefined -version-info 6:0:2
-libtdefx_la_LIBADD = $(LIB_QT) $(LIB_XRENDER) $(LIB_X11)
+libtdefx_la_LIBADD = $(LIB_TQT) $(LIB_XRENDER) $(LIB_X11)
libtdefx_la_NMCHECK = $(srcdir)/libtdefx.nmcheck
libtdefx_la_NMCHECKWEAK = $(srcdir)/libtdefx_weak.nmcheck $(top_srcdir)/tdecore/libqt-mt_weak.nmcheck \
$(top_srcdir)/tdecore/standard_weak.nmcheck
diff --git a/tdehtml/Makefile.am b/tdehtml/Makefile.am
index fc8b80e1..431b0b14 100644
--- a/tdehtml/Makefile.am
+++ b/tdehtml/Makefile.am
@@ -57,7 +57,7 @@ libtdehtml_la_LIBADD = ./xml/libtdehtmlxml.la ./html/libtdehtmlhtml.la \
$(LIBTHAI) \
$(top_builddir)/tdeprint/libtdeprint.la \
$(top_builddir)/tdeutils/libtdeutils.la \
- $(top_builddir)/tdewallet/client/libtdewalletclient.la $(top_builddir)/kjs/libkjs.la $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEFILE) $(top_builddir)/dcop/libDCOP.la $(LIBJPEG) $(LIB_X11)
+ $(top_builddir)/tdewallet/client/libtdewalletclient.la $(top_builddir)/kjs/libkjs.la $(LIB_TDEUI) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEFILE) $(top_builddir)/dcop/libDCOP.la $(LIBJPEG) $(LIB_X11)
# init_libtdehtml is in libtdehtml.so; init_libtdehtmlpart needs to be in the part
dummy.cpp: $(srcdir)/Makefile.am
@@ -67,7 +67,7 @@ dummy.cpp: $(srcdir)/Makefile.am
libtdehtmlpart_la_SOURCES = dummy.cpp
libtdehtmlpart_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
-libtdehtmlpart_la_LIBADD = libtdehtml.la $(LIB_QT)
+libtdehtmlpart_la_LIBADD = libtdehtml.la $(LIB_TQT)
# init_tdehtmlimagefactory is in libtdehtml.so; init_tdehtmlimagepart needs to be in the part
imgdummy.cpp: $(srcdir)/Makefile.am
@@ -77,7 +77,7 @@ imgdummy.cpp: $(srcdir)/Makefile.am
tdehtmlimagepart_la_SOURCES = imgdummy.cpp
tdehtmlimagepart_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
-tdehtmlimagepart_la_LIBADD = libtdehtml.la $(LIB_QT)
+tdehtmlimagepart_la_LIBADD = libtdehtml.la $(LIB_TQT)
INCLUDES = -I$(top_srcdir)/kjs -I$(top_builddir)/kjs -I$(top_srcdir)/kimgio \
-I$(srcdir)/java -I$(top_srcdir)/dcop -I$(srcdir)/misc \
diff --git a/tdehtml/java/Makefile.am b/tdehtml/java/Makefile.am
index c1dd3136..9f83f5a7 100644
--- a/tdehtml/java/Makefile.am
+++ b/tdehtml/java/Makefile.am
@@ -32,6 +32,6 @@ kjavaappletviewer_la_SOURCES= kjavaapplet.cpp kjavaappletcontext.cpp \
kjavadownloader.cpp kjavaappletviewer.cpp
kjavaappletviewer_la_LDFLAGS= $(all_libraries) -module $(KDE_PLUGIN)
-kjavaappletviewer_la_LIBADD= $(LIB_TDEPARTS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEFILE) $(top_builddir)/dcop/libDCOP.la
+kjavaappletviewer_la_LIBADD= $(LIB_TDEPARTS) $(LIB_TQT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEFILE) $(top_builddir)/dcop/libDCOP.la
kde_services_DATA= kjavaappletviewer.desktop
diff --git a/tdehtml/tdemultipart/Makefile.am b/tdehtml/tdemultipart/Makefile.am
index 44032311..427a15a4 100644
--- a/tdehtml/tdemultipart/Makefile.am
+++ b/tdehtml/tdemultipart/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/tdehtml -I$(top_srcdir)/tdeio/httpfilter -I$(top_srcd
kde_module_LTLIBRARIES = libtdemultipart.la
libtdemultipart_la_SOURCES = tdemultipart.cpp
-libtdemultipart_la_LIBADD = $(LIB_TDEPARTS) $(top_builddir)/tdeio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) $(LIBZ)
+libtdemultipart_la_LIBADD = $(LIB_TDEPARTS) $(top_builddir)/tdeio/httpfilter/libhttpfilter.la $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) $(LIBZ)
libtdemultipart_la_DEPENDENCIES = $(LIB_TDEPARTS)
libtdemultipart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
diff --git a/tdeinit/Makefile.am b/tdeinit/Makefile.am
index 9f5914b9..d518f534 100644
--- a/tdeinit/Makefile.am
+++ b/tdeinit/Makefile.am
@@ -33,7 +33,7 @@ AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
tdeinit_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \
$(KDE_RPATH)
-tdeinit_LDADD = $(LIB_TDEPARTS) -lXft $(LIB_QT)
+tdeinit_LDADD = $(LIB_TDEPARTS) -lXft $(LIB_TQT)
tdeioslave_SOURCES = tdeioslave.cpp
tdeioslave_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \
@@ -56,11 +56,11 @@ kwrapper_SOURCES = kwrapper.c
kwrapper_LDADD = $(LIBSOCKET)
tdelauncher_la_LDFLAGS = $(all_libraries) -module -avoid-version
-tdelauncher_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
+tdelauncher_la_LIBADD = $(LIB_TDEIO) $(LIB_TQT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
tdelauncher_la_SOURCES = tdelauncher.cpp tdelauncher_main.cpp autostart.cpp
tdestartupconfig_SOURCES = tdestartupconfig.cpp
-tdestartupconfig_LDADD = $(top_builddir)/tdecore/libtdefakes.la $(LIB_QT)
+tdestartupconfig_LDADD = $(top_builddir)/tdecore/libtdefakes.la $(LIB_TQT)
tdedostartupconfig_SOURCES = tdedostartupconfig.cpp
tdedostartupconfig_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \
$(KDE_RPATH)
diff --git a/tdeio/Makefile.am b/tdeio/Makefile.am
index 9c549ec1..67a074f2 100644
--- a/tdeio/Makefile.am
+++ b/tdeio/Makefile.am
@@ -32,7 +32,7 @@ libtdeio_la_LIBADD = kssl/libkssl.la tdeio/libtdeiocore.la \
tdeio/libtdesycoca.la bookmarks/libkbookmarks.la tdefile/libtdefile.la \
../tdeui/libtdeui.la ../tdesu/libtdesu.la \
../tdewallet/client/libtdewalletclient.la \
- $(LIBZ) $(LIBFAM) $(LIBVOLMGT) $(ACL_LIBS) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
+ $(LIBZ) $(LIBFAM) $(LIBVOLMGT) $(ACL_LIBS) $(LIB_TQT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
magicdir = $(kde_confdir)/magic
magic_DATA = tdeio.magic tdeio.magic.mgc
diff --git a/tdeio/kpasswdserver/Makefile.am b/tdeio/kpasswdserver/Makefile.am
index 2581f5aa..161107e2 100644
--- a/tdeio/kpasswdserver/Makefile.am
+++ b/tdeio/kpasswdserver/Makefile.am
@@ -10,6 +10,6 @@ kde_module_LTLIBRARIES = kded_kpasswdserver.la
kded_kpasswdserver_la_SOURCES = kpasswdserver.cpp kpasswdserver.skel
kded_kpasswdserver_la_METASOURCES = AUTO
kded_kpasswdserver_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kpasswdserver_la_LIBADD = $(top_builddir)/tdewallet/client/libtdewalletclient.la $(LIB_TDEIO) $(LIB_KDED) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
+kded_kpasswdserver_la_LIBADD = $(top_builddir)/tdewallet/client/libtdewalletclient.la $(LIB_TDEIO) $(LIB_KDED) $(LIB_TQT) $(LIB_TDEUI) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
include $(top_srcdir)/admin/Doxyfile.am
diff --git a/tdeio/misc/Makefile.am b/tdeio/misc/Makefile.am
index aedefc37..177392a2 100644
--- a/tdeio/misc/Makefile.am
+++ b/tdeio/misc/Makefile.am
@@ -29,7 +29,7 @@ bin_PROGRAMS = tdemailservice tdetelnetservice
observer_DIR = $(top_srcdir)/tdeio/tdeio
tdeio_uiserver_la_SOURCES = uiserver.cpp uiserver.skel observer.stub
-tdeio_uiserver_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
+tdeio_uiserver_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TQT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
tdeio_uiserver_la_LDFLAGS = $(all_libraries) -module -avoid-version
METASOURCES = AUTO
@@ -38,11 +38,11 @@ kde_services_DATA = tdeio_uiserver.desktop
tdemailservice_SOURCES = tdemailservice.cpp
tdemailservice_LDADD = $(LIB_TDECORE)
-tdemailservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdemailservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
tdetelnetservice_SOURCES = tdetelnetservice.cpp
tdetelnetservice_LDADD = $(LIB_TDEUI)
-tdetelnetservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdetelnetservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
protocol_DATA = tdemailservice.protocol telnet.protocol rlogin.protocol rtsp.protocol ssh.protocol \
mms.protocol mmst.protocol mmsu.protocol pnm.protocol rtspt.protocol rtspu.protocol
diff --git a/tdeio/misc/kpac/Makefile.am b/tdeio/misc/kpac/Makefile.am
index 15e84ec5..969067e0 100644
--- a/tdeio/misc/kpac/Makefile.am
+++ b/tdeio/misc/kpac/Makefile.am
@@ -10,7 +10,7 @@ KDE_CXXFLAGS = $(USE_EXCEPTIONS)
kded_proxyscout_la_SOURCES = proxyscout.skel proxyscout.cpp script.cpp \
downloader.cpp discovery.cpp
kded_proxyscout_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_proxyscout_la_LIBADD = $(LIB_TDEIO) $(top_builddir)/kjs/libkjs.la $(LIB_KDED) $(LIB_QT) \
+kded_proxyscout_la_LIBADD = $(LIB_TDEIO) $(top_builddir)/kjs/libkjs.la $(LIB_KDED) $(LIB_TQT) \
$(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIBRESOLV)
kpac_dhcp_helper_SOURCES = kpac_dhcp_helper.c
diff --git a/tdeio/misc/kssld/Makefile.am b/tdeio/misc/kssld/Makefile.am
index e17b1331..03b87d8e 100644
--- a/tdeio/misc/kssld/Makefile.am
+++ b/tdeio/misc/kssld/Makefile.am
@@ -21,7 +21,7 @@ INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) $(SSL_INCLUDES) -I$(top_srcdir)/tdeio/k
kde_module_LTLIBRARIES = kded_kssld.la
kded_kssld_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kssld_la_LIBADD = $(LIB_TDEIO) $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
+kded_kssld_la_LIBADD = $(LIB_TDEIO) $(LIB_KDED) $(LIB_TQT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
kded_kssld_la_SOURCES = kssld.cpp kssld.skel
METASOURCES = AUTO
diff --git a/tdeio/misc/tdefile/Makefile.am b/tdeio/misc/tdefile/Makefile.am
index bd6831f5..2459fa87 100644
--- a/tdeio/misc/tdefile/Makefile.am
+++ b/tdeio/misc/tdefile/Makefile.am
@@ -5,6 +5,6 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeio/tdeio $(all_includes)
bin_PROGRAMS = tdefile
tdefile_SOURCES = fileprops.cpp
-tdefile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdefile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
tdefile_LDADD = $(LIB_TDEIO)
diff --git a/tdeio/misc/tdentlm/Makefile.am b/tdeio/misc/tdentlm/Makefile.am
index 16164dbe..f237d619 100644
--- a/tdeio/misc/tdentlm/Makefile.am
+++ b/tdeio/misc/tdentlm/Makefile.am
@@ -8,5 +8,5 @@ tdentlminclude_HEADERS = tdentlm.h
libtdentlm_la_SOURCES = tdentlm.cpp des.cpp
libtdentlm_la_LDFLAGS = $(all_libraries) -version-info 0:0:0 -no-undefined
-libtdentlm_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
+libtdentlm_la_LIBADD = $(LIB_TDECORE) $(LIB_TQT)
diff --git a/tdeio/misc/tdesasl/Makefile.am b/tdeio/misc/tdesasl/Makefile.am
index 4ebde7e8..8a8dcb09 100644
--- a/tdeio/misc/tdesasl/Makefile.am
+++ b/tdeio/misc/tdesasl/Makefile.am
@@ -8,5 +8,5 @@ tdesaslinclude_HEADERS = tdesasl.h
libtdesasl_la_SOURCES = tdesasl.cpp
libtdesasl_la_LDFLAGS = $(all_libraries) -version-info 3:0:2 -no-undefined
-libtdesasl_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
+libtdesasl_la_LIBADD = $(LIB_TDECORE) $(LIB_TQT)
diff --git a/tdeio/misc/tdesendbugmail/Makefile.am b/tdeio/misc/tdesendbugmail/Makefile.am
index 71e1c257..3d0dd8b6 100644
--- a/tdeio/misc/tdesendbugmail/Makefile.am
+++ b/tdeio/misc/tdesendbugmail/Makefile.am
@@ -20,7 +20,7 @@ bin_PROGRAMS = tdesendbugmail
INCLUDES= -I$(srcdir)/.. $(all_includes)
tdesendbugmail_SOURCES = main.cpp smtp.cpp
-tdesendbugmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdesendbugmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
tdesendbugmail_LDADD = ../../libtdeio.la
METASOURCES = AUTO
diff --git a/tdeio/misc/tdewalletd/Makefile.am b/tdeio/misc/tdewalletd/Makefile.am
index ed96a35c..0cbe3af9 100644
--- a/tdeio/misc/tdewalletd/Makefile.am
+++ b/tdeio/misc/tdewalletd/Makefile.am
@@ -21,7 +21,7 @@ INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) -I$(top_srcdir)/tdewallet/backend -I$(t
kde_module_LTLIBRARIES = kded_tdewalletd.la
kded_tdewalletd_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_tdewalletd_la_LIBADD = $(LIB_TDEIO) ../../../tdewallet/backend/libtdewalletbackend.la ../../../tdewallet/client/libtdewalletclient.la $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_TDEUI)
+kded_tdewalletd_la_LIBADD = $(LIB_TDEIO) ../../../tdewallet/backend/libtdewalletbackend.la ../../../tdewallet/client/libtdewalletclient.la $(LIB_KDED) $(LIB_TQT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_TDEUI)
kded_tdewalletd_la_SOURCES = tdewalletd.cpp tdewalletd.skel ktimeout.cpp tdewalletwizard.ui kbetterthankdialogbase.ui
METASOURCES = AUTO
diff --git a/tdeio/tdeioexec/Makefile.am b/tdeio/tdeioexec/Makefile.am
index e26f1e83..547ba2bb 100644
--- a/tdeio/tdeioexec/Makefile.am
+++ b/tdeio/tdeioexec/Makefile.am
@@ -3,7 +3,7 @@ AM_CPPFLAGS = $(all_includes)
bin_PROGRAMS = tdeioexec
tdeioexec_SOURCES = main.cpp
-tdeioexec_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdeioexec_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
tdeioexec_LDADD = $(LIB_TDEIO)
noinst_HEADERS = main.h
diff --git a/tdeio/tests/Makefile.am b/tdeio/tests/Makefile.am
index 9ef135c5..d66413a3 100644
--- a/tdeio/tests/Makefile.am
+++ b/tdeio/tests/Makefile.am
@@ -18,7 +18,7 @@
INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeio $(all_includes)
LDADD = $(LIB_TDEIO)
-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
check_PROGRAMS = tdesycocatest getalltest kruntest ktartest kziptest\
tdeioslavetest kdirwatchtest kshredtest speed kurifiltertest \
diff --git a/tdeioslave/bzip2/Makefile.am b/tdeioslave/bzip2/Makefile.am
index 3c7afe69..cb5d41c1 100644
--- a/tdeioslave/bzip2/Makefile.am
+++ b/tdeioslave/bzip2/Makefile.am
@@ -4,7 +4,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = kbzip2filter.la
kbzip2filter_la_SOURCES = kbzip2filter.cpp
-kbzip2filter_la_LIBADD = $(LIB_TDEIO) $(LIBBZ2) $(LIB_QT) $(LIB_TDECORE)
+kbzip2filter_la_LIBADD = $(LIB_TDEIO) $(LIBBZ2) $(LIB_TQT) $(LIB_TDECORE)
kbzip2filter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
kde_services_DATA = kbzip2filter.desktop
diff --git a/tdeioslave/file/Makefile.am b/tdeioslave/file/Makefile.am
index ac3a2094..c7f35b51 100644
--- a/tdeioslave/file/Makefile.am
+++ b/tdeioslave/file/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = tdeio_file.la
tdeio_file_la_SOURCES = file.cc
-tdeio_file_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) $(ACL_LIBS)
+tdeio_file_la_LIBADD = $(LIB_TDEIO) $(LIB_TQT) $(LIB_TDECORE) $(ACL_LIBS)
tdeio_file_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(top_builddir)/dcop/libDCOP.la
noinst_HEADERS = file.h
diff --git a/tdeioslave/ftp/Makefile.am b/tdeioslave/ftp/Makefile.am
index 1421b866..fef6e168 100644
--- a/tdeioslave/ftp/Makefile.am
+++ b/tdeioslave/ftp/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES= $(all_includes)
kde_module_LTLIBRARIES = tdeio_ftp.la
tdeio_ftp_la_SOURCES = ftp.cc
-tdeio_ftp_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE)
+tdeio_ftp_la_LIBADD = $(LIB_TDEIO) $(LIB_TQT) $(LIB_TDECORE)
tdeio_ftp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = ftp.h
diff --git a/tdeioslave/gzip/Makefile.am b/tdeioslave/gzip/Makefile.am
index 591ce27d..ba10f1b4 100644
--- a/tdeioslave/gzip/Makefile.am
+++ b/tdeioslave/gzip/Makefile.am
@@ -1,11 +1,11 @@
INCLUDES = -I$(top_srcdir)/tdeio $(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 = kgzipfilter.la
kgzipfilter_la_SOURCES = kgzipfilter.cpp
-kgzipfilter_la_LIBADD = $(LIB_TDEIO) $(LIBZ) $(LIB_QT) $(LIB_TDECORE)
+kgzipfilter_la_LIBADD = $(LIB_TDEIO) $(LIBZ) $(LIB_TQT) $(LIB_TDECORE)
kgzipfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
kde_services_DATA = kgzipfilter.desktop
diff --git a/tdeioslave/http/Makefile.am b/tdeioslave/http/Makefile.am
index c68f90be..8e2eb418 100644
--- a/tdeioslave/http/Makefile.am
+++ b/tdeioslave/http/Makefile.am
@@ -15,11 +15,11 @@ kde_module_LTLIBRARIES = tdeio_http.la
tdeio_http_la_SOURCES = http.cc
tdeio_http_la_METASOURCES = AUTO
-tdeio_http_la_LIBADD = $(LIB_TDEIO) $(top_builddir)/tdeio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIBZ) $(top_builddir)/dcop/libDCOP.la $(top_builddir)/tdeio/misc/tdentlm/libtdentlm.la
+tdeio_http_la_LIBADD = $(LIB_TDEIO) $(top_builddir)/tdeio/httpfilter/libhttpfilter.la $(LIB_TQT) $(LIB_TDECORE) $(LIBZ) $(top_builddir)/dcop/libDCOP.la $(top_builddir)/tdeio/misc/tdentlm/libtdentlm.la
tdeio_http_la_LDFLAGS = $(all_libraries) $(GSSAPI_RPATH) -module $(KDE_PLUGIN) $(GSSAPI_LIBS)
tdeio_http_cache_cleaner_la_SOURCES = http_cache_cleaner.cpp
-tdeio_http_cache_cleaner_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la
+tdeio_http_cache_cleaner_la_LIBADD = $(LIB_TDEIO) $(LIB_TQT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la
tdeio_http_cache_cleaner_la_LDFLAGS = -module -avoid-version
noinst_HEADERS = http.h
diff --git a/tdeioslave/http/kcookiejar/Makefile.am b/tdeioslave/http/kcookiejar/Makefile.am
index dc331a4a..4e37686f 100644
--- a/tdeioslave/http/kcookiejar/Makefile.am
+++ b/tdeioslave/http/kcookiejar/Makefile.am
@@ -13,12 +13,12 @@ kde_module_LTLIBRARIES = kded_kcookiejar.la
kcookiejar_la_SOURCES = main.cpp
METASOURCES = AUTO
kcookiejar_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kcookiejar_la_LIBADD = $(LIB_TDECORE) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la
+kcookiejar_la_LIBADD = $(LIB_TDECORE) $(LIB_TQT) $(top_builddir)/dcop/libDCOP.la
kded_kcookiejar_la_SOURCES = kcookiejar.cpp kcookieserver.cpp \
kcookieserver.skel kcookiewin.cpp
kded_kcookiejar_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kcookiejar_la_LIBADD = $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_X11) $(LIB_TDEUI) $(top_builddir)/kded/libtdeinit_kded.la
+kded_kcookiejar_la_LIBADD = $(LIB_KDED) $(LIB_TQT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_X11) $(LIB_TDEUI) $(top_builddir)/kded/libtdeinit_kded.la
kded_DATA = kcookiejar.desktop
kdeddir = $(kde_servicesdir)/kded
diff --git a/tdeioslave/http/kcookiejar/tests/Makefile.am b/tdeioslave/http/kcookiejar/tests/Makefile.am
index 95a62de4..f33af5af 100644
--- a/tdeioslave/http/kcookiejar/tests/Makefile.am
+++ b/tdeioslave/http/kcookiejar/tests/Makefile.am
@@ -9,7 +9,7 @@ check_PROGRAMS = kcookiejartest
kcookiejartest_SOURCES = kcookiejartest.cpp
kcookiejartest_LDADD = $(LIB_TDEIO)
-kcookiejartest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcookiejartest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
check-local: kcookiejartest
./kcookiejartest $(srcdir)/cookie.test
diff --git a/tdeioslave/iso/Makefile.am b/tdeioslave/iso/Makefile.am
index ddb1c60f..ed8aaadf 100644
--- a/tdeioslave/iso/Makefile.am
+++ b/tdeioslave/iso/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES = $(all_includes)
tdeio_iso_la_METASOURCES=AUTO
tdeio_iso_la_SOURCES = kisodirectory.cpp kisofile.cpp qfilehack.cpp kiso.cpp iso.cpp
-tdeio_iso_la_LIBADD = libisofs/libisofs.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO)
+tdeio_iso_la_LIBADD = libisofs/libisofs.la $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEIO)
tdeio_iso_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
diff --git a/tdeioslave/metainfo/Makefile.am b/tdeioslave/metainfo/Makefile.am
index 73aff5da..12630039 100644
--- a/tdeioslave/metainfo/Makefile.am
+++ b/tdeioslave/metainfo/Makefile.am
@@ -2,13 +2,13 @@
## Makefile.am of tdebase/tdeioslave/metainfo
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_metainfo.la
tdeio_metainfo_la_SOURCES = metainfo.cpp
-tdeio_metainfo_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE)
+tdeio_metainfo_la_LIBADD = $(LIB_TDEIO) $(LIB_TQT) $(LIB_TDECORE)
tdeio_metainfo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = metainfo.h
diff --git a/tdemdi/Makefile.am b/tdemdi/Makefile.am
index 5afdc04a..cfc6762b 100644
--- a/tdemdi/Makefile.am
+++ b/tdemdi/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/tdemdi/res -I$(top_srcdir)/tdeutils -I$(top_srcdir) -
lib_LTLIBRARIES = libtdemdi.la
libtdemdi_la_LDFLAGS = $(all_libraries) -version-info 1:0
-libtdemdi_la_LIBADD = $(LIB_TDEPARTS) $(top_builddir)/tdeutils/libtdeutils.la $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) $(LIB_X11)
+libtdemdi_la_LIBADD = $(LIB_TDEPARTS) $(top_builddir)/tdeutils/libtdeutils.la $(LIB_TDEUI) $(LIB_TQT) $(LIB_TDECORE) $(LIB_X11)
libtdemdi_la_SOURCES = tdemdichildarea.cpp tdemdichildfrm.cpp tdemdichildfrmcaption.cpp \
tdemdichildview.cpp tdemdimainfrm.cpp tdemditaskbar.cpp tdemdidockcontainer.cpp \
diff --git a/tdemdi/tdemdi/Makefile.am b/tdemdi/tdemdi/Makefile.am
index dc3141ea..738af55b 100644
--- a/tdemdi/tdemdi/Makefile.am
+++ b/tdemdi/tdemdi/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/tdeutils -I$(top_srcdir) -I$(top_srcdir)/tdemdi $(all
lib_LTLIBRARIES = libtdemdi2.la
libtdemdi2_la_LDFLAGS = $(all_libraries) -version-info 1:0
-libtdemdi2_la_LIBADD = $(LIB_TDEPARTS) $(top_builddir)/tdeutils/libtdeutils.la $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE)
+libtdemdi2_la_LIBADD = $(LIB_TDEPARTS) $(top_builddir)/tdeutils/libtdeutils.la $(LIB_TDEUI) $(LIB_TQT) $(LIB_TDECORE)
libtdemdi2_la_SOURCES = mainwindow.cpp dockcontainer.cpp toolviewaccessor.cpp guiclient.cpp tabwidget.cpp
diff --git a/tdenewstuff/Makefile.am b/tdenewstuff/Makefile.am
index b8532a23..81e1e7c9 100644
--- a/tdenewstuff/Makefile.am
+++ b/tdenewstuff/Makefile.am
@@ -5,24 +5,24 @@ METASOURCES = AUTO
lib_LTLIBRARIES = libknewstuff.la
libknewstuff_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
-libknewstuff_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
+libknewstuff_la_LIBADD = $(LIB_TDEIO) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI)
libknewstuff_la_SOURCES = engine.cpp entry.cpp downloaddialog.cpp \
uploaddialog.cpp providerdialog.cpp provider.cpp knewstuff.cpp \
knewstuffgeneric.cpp knewstuffbutton.cpp knewstuffsecure.cpp security.cpp
bin_PROGRAMS = tdehotnewstuff
-tdehotnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdehotnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
tdehotnewstuff_LDADD = libknewstuff.la
tdehotnewstuff_SOURCES = tdehotnewstuff.cpp
EXTRA_PROGRAMS = testnewstuff ghns
-testnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testnewstuff_LDADD = libknewstuff.la
testnewstuff_SOURCES = testnewstuff.cpp
-ghns_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+ghns_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
ghns_LDADD = libknewstuff.la
ghns_SOURCES = ghns.cpp
diff --git a/tdeparts/Makefile.am b/tdeparts/Makefile.am
index 8a169b5b..9e84ac1f 100644
--- a/tdeparts/Makefile.am
+++ b/tdeparts/Makefile.am
@@ -5,7 +5,7 @@ AM_LDFLAGS = $(LDFLAGS_AS_NEEDED)
INCLUDES= -I$(srcdir)/../ -I$(top_srcdir)/tdeio/ -I$(top_srcdir)/libltdl \
-I$(top_srcdir)/tdefile $(all_includes)
libtdeparts_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 3:0:1 -no-undefined
-libtdeparts_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la
+libtdeparts_la_LIBADD = $(LIB_TDEIO) $(LIB_TQT) $(LIB_TDEUI) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la
check-local:
(cd tests && $(MAKE) check )
diff --git a/tdeprint/Makefile.am b/tdeprint/Makefile.am
index e5541a44..c443ef77 100644
--- a/tdeprint/Makefile.am
+++ b/tdeprint/Makefile.am
@@ -11,7 +11,7 @@ INCLUDES= -I$(top_srcdir)/tdefx -I$(top_srcdir)/kded -I$(top_srcdir) $(all_inclu
kde_module_LTLIBRARIES = kded_tdeprintd.la
kded_tdeprintd_la_SOURCES = tdeprintd.skel tdeprintd.cpp kprintprocess.cpp
-kded_tdeprintd_la_LIBADD = $(LIB_TDEIO) $(LIB_KDED) $(LIB_QT) $(LIB_TDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(top_builddir)/kded/libtdeinit_kded.la
+kded_tdeprintd_la_LIBADD = $(LIB_TDEIO) $(LIB_KDED) $(LIB_TQT) $(LIB_TDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(top_builddir)/kded/libtdeinit_kded.la
kded_tdeprintd_la_LDFLAGS = $(all_libraries) -module -avoid-version
#kded_tdeprintd_la_METASOURCES = AUTO
@@ -30,7 +30,7 @@ libtdeprint_la_SOURCES = kmfactory.cpp kmjob.cpp kmjobmanager.cpp kmmanager.cpp
fooparser.cpp fooscanner.cpp ppdparser.cpp ppdscanner.cpp ppdloader.cpp
libtdeprint_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined
-libtdeprint_la_LIBADD = $(LIBZ) $(LIB_QT) $(LIB_TDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_TDEFILE)
+libtdeprint_la_LIBADD = $(LIBZ) $(LIB_TQT) $(LIB_TDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_TDEFILE)
libtdeprint_la_DEPENDENCIES = $(LIB_TDEPARTS)
libtdeprint_la_METASOURCES = AUTO
diff --git a/tdeprint/cups/Makefile.am b/tdeprint/cups/Makefile.am
index 789a3209..eb79d77b 100644
--- a/tdeprint/cups/Makefile.am
+++ b/tdeprint/cups/Makefile.am
@@ -15,7 +15,7 @@ tdeprint_cups_la_SOURCES = cupsinfos.cpp ipprequest.cpp kmcupsfactory.cpp kmcups
kptextpage.cpp kphpgl2page.cpp cupsaddsmb2.cpp kmwother.cpp ippreportdlg.cpp \
kptagspage.cpp
tdeprint_cups_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-tdeprint_cups_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la $(LIB_TDEIO) $(LIB_CUPS) $(LIB_QT) $(LIB_TDEPRINT) $(LIB_TDECORE) $(LIB_TDEUI)
+tdeprint_cups_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la $(LIB_TDEIO) $(LIB_CUPS) $(LIB_TQT) $(LIB_TDEPRINT) $(LIB_TDECORE) $(LIB_TDEUI)
tdeprint_cups_la_METASOURCES = AUTO
noinst_HEADERS = cupsinfos.h ipprequest.h kmcupsjobmanager.h kmcupsmanager.h kmcupsuimanager.h \
@@ -27,7 +27,7 @@ noinst_HEADERS = cupsinfos.h ipprequest.h kmcupsjobmanager.h kmcupsmanager.h kmc
bin_PROGRAMS = make_driver_db_cups cupsdoprint
make_driver_db_cups_SOURCES = make_driver_db_cups.cpp
-make_driver_db_cups_LDADD = ../libdriverparse.a $(top_builddir)/tdecore/libtdefakes.la $(LIBDL) $(LIBZ) $(LIB_QT)
+make_driver_db_cups_LDADD = ../libdriverparse.a $(top_builddir)/tdecore/libtdefakes.la $(LIBDL) $(LIBZ) $(LIB_TQT)
make_driver_db_cups_LDFLAGS = $(all_libraries)
cupsdoprint_SOURCES = cupsdoprint.c
diff --git a/tdeprint/cups/cupsdconf2/Makefile.am b/tdeprint/cups/cupsdconf2/Makefile.am
index 4e2d6c80..df670be1 100644
--- a/tdeprint/cups/cupsdconf2/Makefile.am
+++ b/tdeprint/cups/cupsdconf2/Makefile.am
@@ -15,7 +15,7 @@ cupsdconf_la_SOURCES = cupsdconf.cpp cupsddialog.cpp cupsdpage.cpp cupsdcomment.
qdirmultilineedit.cpp sizewidget.cpp main.cpp
cupsdconf_la_METASOURCES = AUTO
cupsdconf_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_RPATH)
-cupsdconf_la_LIBADD = $(LIB_TDEIO) $(LIB_CUPS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE)
+cupsdconf_la_LIBADD = $(LIB_TDEIO) $(LIB_CUPS) $(LIB_TQT) $(LIB_TDEUI) $(LIB_TDECORE)
noinst_HEADERS = cupsdconf.h cupsdpage.h cupsddialog.h cupsdcomment.h cupsdsplash.h \
cupsdserverpage.h cupsdlogpage.h cupsdjobspage.h cupsdfilterpage.h \
diff --git a/tdeprint/ext/Makefile.am b/tdeprint/ext/Makefile.am
index 1cfccec4..e3de1e95 100644
--- a/tdeprint/ext/Makefile.am
+++ b/tdeprint/ext/Makefile.am
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = tdeprint_ext.la
tdeprint_ext_la_SOURCES = kmextfactory.cpp kmextmanager.cpp kextprinterimpl.cpp kmextuimanager.cpp
tdeprint_ext_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-tdeprint_ext_la_LIBADD = $(LIB_TDEPRINT) $(LIB_QT) $(LIB_TDECORE)
+tdeprint_ext_la_LIBADD = $(LIB_TDEPRINT) $(LIB_TQT) $(LIB_TDECORE)
tdeprint_ext_la_METASOURCES = AUTO
noinst_HEADERS = kmextmanager.h kextprinterimpl.h kmextuimanager.h
diff --git a/tdeprint/lpdunix/Makefile.am b/tdeprint/lpdunix/Makefile.am
index a93163db..75f2e84c 100644
--- a/tdeprint/lpdunix/Makefile.am
+++ b/tdeprint/lpdunix/Makefile.am
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = tdeprint_lpdunix.la
tdeprint_lpdunix_la_SOURCES = kmlpdunixfactory.cpp kmlpdunixmanager.cpp klpdunixprinterimpl.cpp kmlpdunixuimanager.cpp
tdeprint_lpdunix_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-tdeprint_lpdunix_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEPRINT)
+tdeprint_lpdunix_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEPRINT)
tdeprint_lpdunix_la_METASOURCES = AUTO
noinst_HEADERS = kmlpdunixmanager.h klpdunixprinterimpl.h kmlpdunixuimanager.h
diff --git a/tdeprint/lpr/Makefile.am b/tdeprint/lpr/Makefile.am
index 3793d982..0ede93ec 100644
--- a/tdeprint/lpr/Makefile.am
+++ b/tdeprint/lpr/Makefile.am
@@ -14,7 +14,7 @@ tdeprint_lpr_la_SOURCES = printcapreader.cpp lprhandler.cpp \
editentrydialog.cpp
tdeprint_lpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
tdeprint_lpr_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la \
- $(LIB_QT) $(LIB_TDEPRINT) $(LIB_TDEUI) $(LIB_TDECORE)
+ $(LIB_TQT) $(LIB_TDEPRINT) $(LIB_TDEUI) $(LIB_TDECORE)
tdeprint_lpr_la_METASOURCES = AUTO
noinst_HEADERS = printcapreader.h \
diff --git a/tdeprint/management/Makefile.am b/tdeprint/management/Makefile.am
index 0de381d9..170d3818 100644
--- a/tdeprint/management/Makefile.am
+++ b/tdeprint/management/Makefile.am
@@ -8,7 +8,7 @@ tdeinit_LTLIBRARIES = kaddprinterwizard.la
bin_PROGRAMS =
kaddprinterwizard_la_SOURCES = kaddprinterwizard.cpp
-kaddprinterwizard_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEPRINT) $(LIB_TDEUI)
+kaddprinterwizard_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEPRINT) $(LIB_TDEUI)
kaddprinterwizard_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH)
libtdeprint_management_la_SOURCES = \
@@ -26,12 +26,12 @@ libtdeprint_management_la_SOURCES = \
pluginaction.cpp kxmlcommanddlg.cpp kxmlcommandselector.cpp kmconfigcommand.cpp \
kmconfigfilter.cpp kmconfigfonts.cpp kmconfigjobs.cpp networkscanner.cpp
libtdeprint_management_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined
-libtdeprint_management_la_LIBADD = ../libtdeprint.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)
+libtdeprint_management_la_LIBADD = ../libtdeprint.la $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)
libtdeprint_management_la_METASOURCES = AUTO
libtdeprint_management_module_la_SOURCES = tdeprint_management_module.cpp
libtdeprint_management_module_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
-libtdeprint_management_module_la_LIBADD = libtdeprint_management.la $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE)
+libtdeprint_management_module_la_LIBADD = libtdeprint_management.la $(LIB_TQT) $(LIB_TDEUI) $(LIB_TDECORE)
tdeprint_HEADERS = kmmainview.h kmjobviewer.h kmprinterpage.h kiconselectaction.h kmtimer.h
tdeprintdir = $(includedir)/tdeprint
diff --git a/tdeprint/rlpr/Makefile.am b/tdeprint/rlpr/Makefile.am
index a62a7ca4..0bbf6b3b 100644
--- a/tdeprint/rlpr/Makefile.am
+++ b/tdeprint/rlpr/Makefile.am
@@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = tdeprint_rlpr.la
tdeprint_rlpr_la_SOURCES = kmrlprfactory.cpp kmrlprmanager.cpp krlprprinterimpl.cpp kmrlpruimanager.cpp \
kmwrlpr.cpp kmproprlpr.cpp kmproxywidget.cpp kmconfigproxy.cpp
tdeprint_rlpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-tdeprint_rlpr_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la $(LIB_QT) $(LIB_TDEPRINT) $(LIB_TDECORE) $(LIB_TDEUI)
+tdeprint_rlpr_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la $(LIB_TQT) $(LIB_TDEPRINT) $(LIB_TDECORE) $(LIB_TDEUI)
tdeprint_rlpr_la_METASOURCES = AUTO
noinst_HEADERS = kmrlprmanager.h krlprprinterimpl.h kmrlpruimanager.h kmwrlpr.h kmproprlpr.h \
diff --git a/tdeprint/tools/escputil/Makefile.am b/tdeprint/tools/escputil/Makefile.am
index 143f4ca1..b6f1175a 100644
--- a/tdeprint/tools/escputil/Makefile.am
+++ b/tdeprint/tools/escputil/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = tdeprint_tool_escputil.la
tdeprint_tool_escputil_la_SOURCES = escpwidget.cpp
tdeprint_tool_escputil_la_METASOURCES = AUTO
tdeprint_tool_escputil_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-tdeprint_tool_escputil_la_LIBADD = $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE)
+tdeprint_tool_escputil_la_LIBADD = $(LIB_TDEUI) $(LIB_TQT) $(LIB_TDECORE)
noinst_HEADERS = escpwidget.h
diff --git a/tderandr/Makefile.am b/tderandr/Makefile.am
index 7818014d..9a8e1cf3 100644
--- a/tderandr/Makefile.am
+++ b/tderandr/Makefile.am
@@ -13,7 +13,7 @@ libtderandr_la_SOURCES = randr.cpp lowlevel_randr.c ktimerdialog.cpp libtderand
METASOURCES = AUTO
libtderandr_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 0:95 -no-undefined
-libtderandr_la_LIBADD = $(LIBASOUND) ../tdecore/libtdecore.la $(LIB_QT) $(LIB_XRANDR)
+libtderandr_la_LIBADD = $(LIBASOUND) ../tdecore/libtdecore.la $(LIB_TQT) $(LIB_XRANDR)
DOXYGEN_REFERENCES = tdecore
include ../admin/Doxyfile.am
diff --git a/tderesources/Makefile.am b/tderesources/Makefile.am
index 252e29be..a2719467 100644
--- a/tderesources/Makefile.am
+++ b/tderesources/Makefile.am
@@ -15,7 +15,7 @@ libtderesources_la_SOURCES = resource.cpp \
configpage.cpp
libtderesources_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
-libtderesources_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
+libtderesources_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TQT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
kresincludedir = $(includedir)/tderesources
kresinclude_HEADERS = resource.h \
@@ -32,12 +32,12 @@ kde_module_LTLIBRARIES = kcm_tderesources.la
kcm_tderesources_la_SOURCES = kcmtderesources.cpp
kcm_tderesources_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_tderesources_la_LIBADD = libtderesources.la $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE)
+kcm_tderesources_la_LIBADD = libtderesources.la $(LIB_TQT) $(LIB_TDEUI) $(LIB_TDECORE)
check_PROGRAMS = testresources
-testresources_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testresources_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testresources_LDADD = libtderesources.la
testresources_SOURCES = testresources.cpp
diff --git a/tdespell2/plugins/aspell/Makefile.am b/tdespell2/plugins/aspell/Makefile.am
index 4d40583f..d78e4a78 100644
--- a/tdespell2/plugins/aspell/Makefile.am
+++ b/tdespell2/plugins/aspell/Makefile.am
@@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = tdespell_aspell.la
tdespell_aspell_la_SOURCES = tdespell_aspellclient.cpp tdespell_aspelldict.cpp
tdespell_aspell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
-tdespell_aspell_la_LIBADD = ../../ui/libtdespell2.la -laspell $(LIB_QT) $(LIB_TDECORE)
+tdespell_aspell_la_LIBADD = ../../ui/libtdespell2.la -laspell $(LIB_TQT) $(LIB_TDECORE)
service_DATA = tdespell_aspell.desktop
servicedir = $(kde_servicesdir)
diff --git a/tdespell2/plugins/hspell/Makefile.am b/tdespell2/plugins/hspell/Makefile.am
index fb4a193f..faabb939 100644
--- a/tdespell2/plugins/hspell/Makefile.am
+++ b/tdespell2/plugins/hspell/Makefile.am
@@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = tdespell_hspell.la
tdespell_hspell_la_SOURCES = tdespell_hspellclient.cpp tdespell_hspelldict.cpp
tdespell_hspell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
-tdespell_hspell_la_LIBADD = ../../ui/libtdespell2.la -lhspell -lz $(LIB_QT) $(LIB_TDECORE)
+tdespell_hspell_la_LIBADD = ../../ui/libtdespell2.la -lhspell -lz $(LIB_TQT) $(LIB_TDECORE)
service_DATA = tdespell_hspell.desktop
servicedir = $(kde_servicesdir)
diff --git a/tdespell2/plugins/ispell/Makefile.am b/tdespell2/plugins/ispell/Makefile.am
index 15dffda2..3fd9af5e 100644
--- a/tdespell2/plugins/ispell/Makefile.am
+++ b/tdespell2/plugins/ispell/Makefile.am
@@ -18,7 +18,7 @@ tdespell_ispell_la_SOURCES = tdespell_ispellclient.cpp tdespell_ispelldict.cpp \
ispell_checker.cpp
tdespell_ispell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
-tdespell_ispell_la_LIBADD = ../../ui/libtdespell2.la $(LIB_QT) $(LIB_TDECORE)
+tdespell_ispell_la_LIBADD = ../../ui/libtdespell2.la $(LIB_TQT) $(LIB_TDECORE)
service_DATA = tdespell_ispell.desktop
servicedir = $(kde_servicesdir)
diff --git a/tdespell2/ui/Makefile.am b/tdespell2/ui/Makefile.am
index 1a259680..23399625 100644
--- a/tdespell2/ui/Makefile.am
+++ b/tdespell2/ui/Makefile.am
@@ -18,4 +18,4 @@ dialog.lo: tdespell2ui.h
libtdespell2_la_SOURCES = dialog.cpp
libtdespell2_la_LDFLAGS = -no-undefined -version-info 1:0:0 $(all_libraries)
-libtdespell2_la_LIBADD = libtdespell2_noinst.la ../libtdespell2base.la ../../tdeutils/libtdeutils.la $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEFILE)
+libtdespell2_la_LIBADD = libtdespell2_noinst.la ../libtdespell2base.la ../../tdeutils/libtdeutils.la $(LIB_TQT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEFILE)
diff --git a/tdestyles/highcolor/Makefile.am b/tdestyles/highcolor/Makefile.am
index 5b288021..64c6b36d 100644
--- a/tdestyles/highcolor/Makefile.am
+++ b/tdestyles/highcolor/Makefile.am
@@ -24,6 +24,6 @@ INCLUDES = -I$(top_srcdir)/tdefx $(all_includes)
noinst_HEADERS = highcolor.h bitmaps.h
kde_style_LTLIBRARIES = highcolor.la
highcolor_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-highcolor_la_LIBADD = ../../tdefx/libtdefx.la $(LIB_QT)
+highcolor_la_LIBADD = ../../tdefx/libtdefx.la $(LIB_TQT)
highcolor_la_SOURCES = highcolor.cpp
highcolor_la_METASOURCES = AUTO
diff --git a/tdestyles/highcontrast/Makefile.am b/tdestyles/highcontrast/Makefile.am
index 8c7d1132..15e2d4ca 100644
--- a/tdestyles/highcontrast/Makefile.am
+++ b/tdestyles/highcontrast/Makefile.am
@@ -35,7 +35,7 @@ noinst_HEADERS = highcontrast.h
kde_style_LTLIBRARIES = highcontrast.la
highcontrast_la_SOURCES = highcontrast.cpp
highcontrast_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-highcontrast_la_LIBADD = ../../tdefx/libtdefx.la $(LIB_QT)
+highcontrast_la_LIBADD = ../../tdefx/libtdefx.la $(LIB_TQT)
highcontrast_la_METASOURCES = AUTO
DISTCLEANFILES = $(highcontrast_la_METASOURCES)
diff --git a/tdestyles/highcontrast/config/Makefile.am b/tdestyles/highcontrast/config/Makefile.am
index 31592f28..df142525 100644
--- a/tdestyles/highcontrast/config/Makefile.am
+++ b/tdestyles/highcontrast/config/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = $(all_includes)
noinst_HEADERS = highcontrastconfig.h
kde_module_LTLIBRARIES = tdestyle_highcontrast_config.la
tdestyle_highcontrast_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-tdestyle_highcontrast_config_la_LIBADD = $(LIB_QT) $(LIB_TDECORE)
+tdestyle_highcontrast_config_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE)
tdestyle_highcontrast_config_la_SOURCES = highcontrastconfig.cpp
tdestyle_highcontrast_config_la_METASOURCES = AUTO
diff --git a/tdestyles/keramik/Makefile.am b/tdestyles/keramik/Makefile.am
index c4c800f6..340f6041 100644
--- a/tdestyles/keramik/Makefile.am
+++ b/tdestyles/keramik/Makefile.am
@@ -6,7 +6,7 @@ KDE_CXXFLAGS = -UQT_NO_ASCII_CAST
noinst_HEADERS = keramik.h pixmaploader.h keramikimage.h bitmaps.h gradients.h colorutil.h
kde_style_LTLIBRARIES = keramik.la
keramik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-keramik_la_LIBADD = ../../tdefx/libtdefx.la $(LIB_QT) $(LIB_XEXT)
+keramik_la_LIBADD = ../../tdefx/libtdefx.la $(LIB_TQT) $(LIB_XEXT)
keramik_la_SOURCES = keramik.cpp pixmaploader.cpp gradients.cpp colorutil.cpp
keramik_la_COMPILE_FIRST = keramikrc.h
keramik_la_METASOURCES = AUTO
@@ -15,7 +15,7 @@ noinst_PROGRAMS = genembed
genembed_SOURCES = genembed.cpp
genembed_LDADD = ../../tdefx/libtdefx.la
-genembed_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+genembed_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
pixmaps.keramik: pics/checkbox-off.png pics/checkbox-on.png pics/combobox-list-bc.png\
pics/combobox-list-bl.png pics/combobox-list-br.png pics/combobox-list-cl.png pics/combobox-list-cr.png\
diff --git a/tdestyles/kthemestyle/Makefile.am b/tdestyles/kthemestyle/Makefile.am
index bc1b13e6..ab7adb8a 100644
--- a/tdestyles/kthemestyle/Makefile.am
+++ b/tdestyles/kthemestyle/Makefile.am
@@ -24,6 +24,6 @@ INCLUDES = -I$(top_srcdir)/tdefx $(all_includes)
noinst_HEADERS = kthemestyle.h kthemebase.h tdestyledirs.h
kde_style_LTLIBRARIES = kthemestyle.la
kthemestyle_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kthemestyle_la_LIBADD = ../../tdefx/libtdefx.la ../../tdecore/libtdecore.la -ldl $(LIB_QT)
+kthemestyle_la_LIBADD = ../../tdefx/libtdefx.la ../../tdecore/libtdecore.la -ldl $(LIB_TQT)
kthemestyle_la_SOURCES = kthemebase.cpp kthemestyle.cpp tdestyledirs.cpp
kthemestyle_la_METASOURCES = AUTO
diff --git a/tdestyles/light/Makefile.am b/tdestyles/light/Makefile.am
index 8233d22d..507275ac 100644
--- a/tdestyles/light/Makefile.am
+++ b/tdestyles/light/Makefile.am
@@ -24,6 +24,6 @@ INCLUDES = -I$(top_srcdir)/tdefx $(all_includes)
noinst_HEADERS = lightstyle-v2.h lightstyle-v3.h
kde_style_LTLIBRARIES = light.la
light_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-light_la_LIBADD = $(LIB_QT) ../../tdefx/libtdefx.la
+light_la_LIBADD = $(LIB_TQT) ../../tdefx/libtdefx.la
light_la_SOURCES = light.cpp lightstyle-v2.cpp lightstyle-v3.cpp
light_la_METASOURCES = AUTO
diff --git a/tdestyles/plastik/Makefile.am b/tdestyles/plastik/Makefile.am
index 2d228dd0..deaba102 100644
--- a/tdestyles/plastik/Makefile.am
+++ b/tdestyles/plastik/Makefile.am
@@ -16,7 +16,7 @@ noinst_HEADERS = plastik.h misc.h
kde_style_LTLIBRARIES = plastik.la
plastik_la_SOURCES = plastik.cpp misc.cpp
plastik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-plastik_la_LIBADD = ../../tdefx/libtdefx.la $(LIB_QT)
+plastik_la_LIBADD = ../../tdefx/libtdefx.la $(LIB_TQT)
plastik_la_METASOURCES = AUTO
DISTCLEANFILES = $(plastik_la_METASOURCES)
diff --git a/tdestyles/plastik/config/Makefile.am b/tdestyles/plastik/config/Makefile.am
index 428baf69..05609b8c 100644
--- a/tdestyles/plastik/config/Makefile.am
+++ b/tdestyles/plastik/config/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = $(all_includes)
noinst_HEADERS = plastikconf.h
kde_module_LTLIBRARIES = tdestyle_plastik_config.la
tdestyle_plastik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-tdestyle_plastik_config_la_LIBADD = $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE)
+tdestyle_plastik_config_la_LIBADD = $(LIB_TDEUI) $(LIB_TQT) $(LIB_TDECORE)
tdestyle_plastik_config_la_SOURCES = plastikconf.cpp
tdestyle_plastik_config_la_METASOURCES = AUTO
diff --git a/tdestyles/utils/installtheme/Makefile.am b/tdestyles/utils/installtheme/Makefile.am
index 665c73a4..53ab5592 100644
--- a/tdestyles/utils/installtheme/Makefile.am
+++ b/tdestyles/utils/installtheme/Makefile.am
@@ -10,9 +10,9 @@ bin_PROGRAMS = kinstalltheme
kinstalltheme_SOURCES = main.cpp
# the library search path.
-kinstalltheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kinstalltheme_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.
-kinstalltheme_LDADD = $(LIB_QT) $(LIB_TDECORE)
+kinstalltheme_LDADD = $(LIB_TQT) $(LIB_TDECORE)
diff --git a/tdesu/Makefile.am b/tdesu/Makefile.am
index beec69d2..974c7020 100644
--- a/tdesu/Makefile.am
+++ b/tdesu/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/tdeio/ $(all_includes)
lib_LTLIBRARIES = libtdesu.la
libtdesu_la_SOURCES = client.cpp process.cpp kcookie.cpp su.cpp ssh.cpp stub.cpp tdesu_pty.cpp
libtdesu_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(all_libraries)
-libtdesu_la_LIBADD = $(LIB_TDECORE) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la
+libtdesu_la_LIBADD = $(LIB_TDECORE) $(LIB_TQT) $(top_builddir)/dcop/libDCOP.la
libtdesu_la_NMCHECK = $(srcdir)/libtdesu.nmcheck
libtdesu_la_NMCHECKWEAK = $(srcdir)/libtdesu_weak.nmcheck $(top_srcdir)/tdecore/libtdecore_weak.nmcheck \
$(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/tdecore/libqt-mt_weak.nmcheck
diff --git a/tdeui/Makefile.am b/tdeui/Makefile.am
index 04422b0a..8aa95db9 100644
--- a/tdeui/Makefile.am
+++ b/tdeui/Makefile.am
@@ -28,7 +28,7 @@ AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
lib_LTLIBRARIES = libtdeui.la libtdespell.la
libtdeui_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined -version-info 6:0:2
-libtdeui_la_LIBADD = ../tdecore/libtdecore.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) $(top_builddir)/tdefx/libtdefx.la $(LIB_XEXT)
+libtdeui_la_LIBADD = ../tdecore/libtdecore.la $(LIB_TQT) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) $(top_builddir)/tdefx/libtdefx.la $(LIB_XEXT)
libtdespell_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 6:0:2 -no-undefined
libtdespell_la_SOURCES = dummy.cpp
diff --git a/tdeui/kdetrayproxy/Makefile.am b/tdeui/kdetrayproxy/Makefile.am
index 39782b92..67fc3370 100644
--- a/tdeui/kdetrayproxy/Makefile.am
+++ b/tdeui/kdetrayproxy/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kded_kdetrayproxy.la
INCLUDES= -I$(top_srcdir)/kded $(all_includes)
kded_kdetrayproxy_la_SOURCES = kdetrayproxy.cpp module.cpp module.skel
kded_kdetrayproxy_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kdetrayproxy_la_LIBADD = $(LIB_TDECORE) $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
+kded_kdetrayproxy_la_LIBADD = $(LIB_TDECORE) $(LIB_KDED) $(LIB_TQT) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
METASOURCES = AUTO
diff --git a/tdeunittest/Makefile.am b/tdeunittest/Makefile.am
index 66ce0dff..10731a9b 100644
--- a/tdeunittest/Makefile.am
+++ b/tdeunittest/Makefile.am
@@ -4,13 +4,13 @@ METASOURCES = AUTO
lib_LTLIBRARIES = libtdeunittest.la
libtdeunittest_la_SOURCES = runner.cpp tester.cpp
libtdeunittest_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0:0
-libtdeunittest_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
+libtdeunittest_la_LIBADD = $(LIB_TDECORE) $(LIB_TQT)
libtdeunittestinclude_HEADERS = runner.h tester.h module.h
libtdeunittestincludedir = $(includedir)/tdeunittest
bin_PROGRAMS = tdeunittestmodrunner
-tdeunittestmodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdeunittestmodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
tdeunittestmodrunner_LDADD = libtdeunittest.la $(LIB_TDECORE)
tdeunittestmodrunner_SOURCES = modrunner.cpp
diff --git a/tdeutils/Makefile.am b/tdeutils/Makefile.am
index 03308cb8..3fbf76c5 100644
--- a/tdeutils/Makefile.am
+++ b/tdeutils/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/interfaces/kregexpeditor $(all_includes)
lib_LTLIBRARIES = libtdeutils.la
libtdeutils_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
# Needs TDETrader
-libtdeutils_la_LIBADD = ../tdeio/libtdeio.la ksettings/libksettings.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_X11)
+libtdeutils_la_LIBADD = ../tdeio/libtdeio.la ksettings/libksettings.la $(LIB_TQT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_X11)
libtdeutils_la_SOURCES = kfind.cpp kfinddialog.cpp kreplace.cpp \
kreplacedialog.cpp tdecmoduleinfo.cpp tdecmoduleloader.cpp \
diff --git a/tdewallet/backend/Makefile.am b/tdewallet/backend/Makefile.am
index 79bfc082..487385ea 100644
--- a/tdewallet/backend/Makefile.am
+++ b/tdewallet/backend/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = -I$(srcdir)/../client $(all_includes)
lib_LTLIBRARIES = libtdewalletbackend.la
libtdewalletbackend_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0 -no-undefined
-libtdewalletbackend_la_LIBADD = $(LIB_QT) ../../tdecore/libtdecore.la
+libtdewalletbackend_la_LIBADD = $(LIB_TQT) ../../tdecore/libtdecore.la
libtdewalletbackend_la_SOURCES = blockcipher.cc \
blowfish.cc \
cbc.cc \
diff --git a/tdewallet/client/Makefile.am b/tdewallet/client/Makefile.am
index d10938a4..4fe262f7 100644
--- a/tdewallet/client/Makefile.am
+++ b/tdewallet/client/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES= -I$(srcdir) $(all_includes)
lib_LTLIBRARIES = libtdewalletclient.la
libtdewalletclient_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:1 -no-undefined
-libtdewalletclient_la_LIBADD = $(LIB_TDECORE) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la
+libtdewalletclient_la_LIBADD = $(LIB_TDECORE) $(LIB_TQT) $(top_builddir)/dcop/libDCOP.la
libtdewalletclient_la_SOURCES = tdewallet.skel \
tdewallet.cc
diff --git a/tdewallet/tests/Makefile.am b/tdewallet/tests/Makefile.am
index 83aa39dc..eacd9e95 100644
--- a/tdewallet/tests/Makefile.am
+++ b/tdewallet/tests/Makefile.am
@@ -6,15 +6,15 @@ check_PROGRAMS = tdewalletasync tdewalletsync tdewalletboth
tdewalletasync_SOURCES = tdewalletasync.cpp tdewallettest.cpp
tdewalletasync_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries)
tdewalletasync_LDADD = $(top_builddir)/tdewallet/client/libtdewalletclient.la \
- $(LIB_TDECORE) $(LIB_QT)
+ $(LIB_TDECORE) $(LIB_TQT)
tdewalletsync_SOURCES = tdewalletsync.cpp
tdewalletsync_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries)
tdewalletsync_LDADD = $(top_builddir)/tdewallet/client/libtdewalletclient.la \
- $(LIB_TDECORE) $(LIB_QT)
+ $(LIB_TDECORE) $(LIB_TQT)
tdewalletboth_SOURCES = tdewalletboth.cpp tdewallettest.cpp
tdewalletboth_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries)
tdewalletboth_LDADD = $(top_builddir)/tdewallet/client/libtdewalletclient.la \
- $(LIB_TDECORE) $(LIB_QT)
+ $(LIB_TDECORE) $(LIB_TQT)
INCLUDES = -I$(top_srcdir)/tdewallet/client
diff --git a/tdewidgets/Makefile.am b/tdewidgets/Makefile.am
index 894d3339..4fb9bef5 100644
--- a/tdewidgets/Makefile.am
+++ b/tdewidgets/Makefile.am
@@ -25,12 +25,12 @@ INCLUDES = -I$(top_srcdir)/tdefile $(all_includes)
bin_PROGRAMS = maketdewidgets
maketdewidgets_SOURCES = maketdewidgets.cpp
-maketdewidgets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-maketdewidgets_LDADD = $(LIB_QT) ../tdecore/libtdecore.la
+maketdewidgets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+maketdewidgets_LDADD = $(LIB_TQT) ../tdecore/libtdecore.la
kde_widget_LTLIBRARIES = tdewidgets.la
tdewidgets_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
-tdewidgets_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEABC) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE)
+tdewidgets_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEABC) $(LIB_TQT) $(LIB_TDEUI) $(LIB_TDECORE)
tdewidgets_la_SOURCES = classpreviews.cpp tdewidgets.cpp
tdewidgets.cpp: $(srcdir)/kde.widgets maketdewidgets