summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-09-17 23:19:52 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2018-09-17 23:19:52 +0900
commitaa882de2135a84abcb0d8b2b41239ebb24cd385a (patch)
tree2f080e4ebf64c77349896ceeef9440e6e17f9872
parentfde2af1d62167f372c9b84be8ede32bdb62bb7a8 (diff)
downloadtdepim-aa882de2135a84abcb0d8b2b41239ebb24cd385a.tar.gz
tdepim-aa882de2135a84abcb0d8b2b41239ebb24cd385a.zip
LIB_QT -> LIB_TQT conversion to align to updated admin module
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--akregator/src/Makefile.am4
-rw-r--r--akregator/src/mk4storage/Makefile.am2
-rw-r--r--certmanager/Makefile.am2
-rw-r--r--certmanager/kwatchgnupg/Makefile.am2
-rw-r--r--kaddressbook/Makefile.am4
-rw-r--r--kaddressbook/editors/Makefile.am2
-rw-r--r--kaddressbook/features/Makefile.am6
-rw-r--r--kaddressbook/views/Makefile.am6
-rw-r--r--kaddressbook/xxport/Makefile.am18
-rw-r--r--kalarm/kalarmd/Makefile.am4
-rw-r--r--kandy/src/Makefile.am4
-rw-r--r--karm/Makefile.am2
-rw-r--r--karm/test/Makefile.am8
-rw-r--r--kgantt/kgantt/Makefile.am2
-rw-r--r--kitchensync/src/Makefile.am6
-rw-r--r--kmailcvt/Makefile.am2
-rw-r--r--kmobile/Makefile.am4
-rw-r--r--knode/Makefile.am4
-rw-r--r--knotes/Makefile.am4
-rw-r--r--kode/Makefile.am2
-rw-r--r--kode/kwsdl/Makefile.am2
-rw-r--r--kode/kwsdl/kung/Makefile.am2
-rw-r--r--kode/kwsdl/schema/Makefile.am2
-rw-r--r--kode/kwsdl/tests/google/Makefile.am2
-rw-r--r--kode/kwsdl/wscl/Makefile.am2
-rw-r--r--kode/kxml_compiler/Makefile.am2
-rw-r--r--konsolekalendar/Makefile.am2
-rw-r--r--kontact/src/Makefile.am2
-rw-r--r--korganizer/Makefile.am8
-rw-r--r--korganizer/korgac/Makefile.am4
-rw-r--r--korganizer/plugins/datenums/Makefile.am2
-rw-r--r--korganizer/plugins/exchange/Makefile.am2
-rw-r--r--korganizer/plugins/hebrew/Makefile.am2
-rw-r--r--korganizer/plugins/printing/journal/Makefile.am2
-rw-r--r--korganizer/plugins/printing/year/Makefile.am2
-rw-r--r--korn/Makefile.am2
-rw-r--r--korn/tdeconf_update/Makefile.am4
-rw-r--r--ktnef/gui/Makefile.am2
-rw-r--r--ktnef/tests/Makefile.am2
-rw-r--r--libemailfunctions/Makefile.am2
-rw-r--r--libemailfunctions/tests/Makefile.am4
-rw-r--r--libkcal/Makefile.am6
-rw-r--r--libkcal/tests/Makefile.am28
-rw-r--r--libtdenetwork/qgpgme/Makefile.am2
-rw-r--r--libtdenetwork/qgpgme/tests/Makefile.am2
-rw-r--r--libtdepim/Makefile.am4
-rw-r--r--libtdepim/cfgc/Makefile.am4
-rw-r--r--libtdepim/komposer/core/tests/Makefile.am6
-rw-r--r--libtdepim/komposer/test/Makefile.am2
-rw-r--r--libtdepim/tdepartsdesignerplugin/Makefile.am2
-rw-r--r--libtdepim/tests/Makefile.am4
-rw-r--r--plugins/kmail/bodypartformatter/Makefile.am6
-rw-r--r--tdeabc/frontend/Makefile.am2
-rw-r--r--tdeabc/tdeabc2mutt/Makefile.am2
-rw-r--r--tdeabc/tdeabcdistlistupdater/Makefile.am2
-rw-r--r--tdefile-plugins/ics/Makefile.am2
-rw-r--r--tdefile-plugins/palm-databases/Makefile.am2
-rw-r--r--tdefile-plugins/vcf/Makefile.am2
-rw-r--r--tdeioslave/mbox/Makefile.am2
-rw-r--r--tdeioslave/sieve/Makefile.am2
-rw-r--r--tderesources/featureplan/Makefile.am4
-rw-r--r--tderesources/groupwise/soap/Makefile.am2
-rw-r--r--tderesources/scalix/scalixadmin/Makefile.am2
-rw-r--r--tderesources/slox/Makefile.am2
-rw-r--r--wizards/Makefile.am14
65 files changed, 124 insertions, 124 deletions
diff --git a/akregator/src/Makefile.am b/akregator/src/Makefile.am
index 9af5fb09e..3c77f9161 100644
--- a/akregator/src/Makefile.am
+++ b/akregator/src/Makefile.am
@@ -20,7 +20,7 @@ bin_PROGRAMS = akregator
# the application source, library search path, and link libraries
akregator_SOURCES = main.cpp mainwindow.cpp
-akregator_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+akregator_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
akregator_LDADD = $(LIB_TDEPARTS) libakregatorprivate.la
#akregator_LDADD = $(LIB_TDEPARTS) libakregatorprivate.la $(top_builddir)/libtdepim/libtdepim.la
@@ -146,7 +146,7 @@ libakregatorpart_la_SOURCES = \
kspeech.stub
libakregatorpart_la_LDFLAGS = $(KDE_RPATH) $(KDE_PLUGIN) $(LIB_TDEUTILS) -avoid-version -no-undefined $(all_libraries)
-libakregatorpart_la_LIBADD = libakregatorprivate.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_TDEIO) $(LIB_TDEPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim
+libakregatorpart_la_LIBADD = libakregatorprivate.la $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_TDEIO) $(LIB_TDEPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim
# this is where the desktop file will go
partdesktopdir = $(kde_servicesdir)
diff --git a/akregator/src/mk4storage/Makefile.am b/akregator/src/mk4storage/Makefile.am
index e862c038d..cff4ef197 100644
--- a/akregator/src/mk4storage/Makefile.am
+++ b/akregator/src/mk4storage/Makefile.am
@@ -13,7 +13,7 @@ libakregator_mk4storage_plugin_la_LIBADD = \
../libakregatorprivate.la \
$(LIB_TDEFILE) \
$(LIB_TDECORE) \
- $(LIB_QT) \
+ $(LIB_TQT) \
$(LIB_TDEUI)
libakregator_mk4storage_plugin_la_LDFLAGS = \
diff --git a/certmanager/Makefile.am b/certmanager/Makefile.am
index 3f077079a..ca1431f91 100644
--- a/certmanager/Makefile.am
+++ b/certmanager/Makefile.am
@@ -17,7 +17,7 @@ kleopatra_SOURCES = \
METASOURCES = AUTO
-kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kleopatra_LDADD = conf/libconf.la lib/libkleopatra.la $(LIB_TDEUTILS) $(LIB_TDEABC)
rcdir = $(kde_datadir)/kleopatra
diff --git a/certmanager/kwatchgnupg/Makefile.am b/certmanager/kwatchgnupg/Makefile.am
index 07702a24c..e1cb8ad3f 100644
--- a/certmanager/kwatchgnupg/Makefile.am
+++ b/certmanager/kwatchgnupg/Makefile.am
@@ -13,7 +13,7 @@ kwatchgnupg_SOURCES = \
METASOURCES = AUTO
-kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kwatchgnupg_LDADD = ../conf/libconf.la ../lib/libkleopatra.la $(LIB_TDEUTILS) $(LIB_TDEABC)
rcdir = $(kde_datadir)/kwatchgnupg
diff --git a/kaddressbook/Makefile.am b/kaddressbook/Makefile.am
index 16026acae..04c2a48c2 100644
--- a/kaddressbook/Makefile.am
+++ b/kaddressbook/Makefile.am
@@ -17,14 +17,14 @@ INCLUDES= -I$(top_srcdir)/kaddressbook/interfaces \
bin_PROGRAMS = kaddressbook
kaddressbook_SOURCES = main.cpp kaddressbookmain.cpp
-kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kaddressbook_LDADD = libkaddressbook.la
kde_module_LTLIBRARIES = libkaddressbookpart.la
libkaddressbookpart_la_SOURCES = kaddressbook_part.cpp
libkaddressbookpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddressbookpart_la_LIBADD = libkaddressbook.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) -lDCOP
+libkaddressbookpart_la_LIBADD = libkaddressbook.la $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) -lDCOP
lib_LTLIBRARIES = libkaddressbook.la
libkaddressbook_la_SOURCES = addresseeconfig.cpp addresseeeditordialog.cpp \
diff --git a/kaddressbook/editors/Makefile.am b/kaddressbook/editors/Makefile.am
index 2eeafc941..6872a8aa5 100644
--- a/kaddressbook/editors/Makefile.am
+++ b/kaddressbook/editors/Makefile.am
@@ -13,7 +13,7 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
libkaddrbk_cryptosettings_la_SOURCES = cryptowidget.cpp
libkaddrbk_cryptosettings_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) # -no-undefined
-libkaddrbk_cryptosettings_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC)
+libkaddrbk_cryptosettings_la_LIBADD = $(XXLIBS) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC)
noinst_HEADERS = cryptowidget.h imeditorwidget.h imaddresswidget.h
diff --git a/kaddressbook/features/Makefile.am b/kaddressbook/features/Makefile.am
index bfcbd9651..78d2e5aa1 100644
--- a/kaddressbook/features/Makefile.am
+++ b/kaddressbook/features/Makefile.am
@@ -17,16 +17,16 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
if compile_newdistrlists
libkaddrbk_distributionlistng_la_SOURCES = distributionlistngwidget.cpp
libkaddrbk_distributionlistng_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_distributionlistng_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC)
+libkaddrbk_distributionlistng_la_LIBADD = $(XXLIBS) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC)
else
libkaddrbk_distributionlist_la_SOURCES = distributionlistwidget.cpp
libkaddrbk_distributionlist_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_distributionlist_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC)
+libkaddrbk_distributionlist_la_LIBADD = $(XXLIBS) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC)
endif
libkaddrbk_resourceselection_la_SOURCES = resourceselection.cpp
libkaddrbk_resourceselection_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_resourceselection_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) -ltderesources
+libkaddrbk_resourceselection_la_LIBADD = $(XXLIBS) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) -ltderesources
noinst_HEADERS = distributionlistwidget.h distributionlistngwidget.h resourceselection.h
diff --git a/kaddressbook/views/Makefile.am b/kaddressbook/views/Makefile.am
index 09ee38784..9ba0331aa 100644
--- a/kaddressbook/views/Makefile.am
+++ b/kaddressbook/views/Makefile.am
@@ -12,17 +12,17 @@ libkaddrbk_cardview_la_SOURCES = cardview.cpp colorlistbox.cpp \
configurecardviewdialog.cpp \
kaddressbookcardview.cpp
libkaddrbk_cardview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_cardview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEABC)
+libkaddrbk_cardview_la_LIBADD = $(XXLIBS) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEABC)
libkaddrbk_iconview_la_SOURCES = kaddressbookiconview.cpp
libkaddrbk_iconview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_iconview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEABC)
+libkaddrbk_iconview_la_LIBADD = $(XXLIBS) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEABC)
libkaddrbk_tableview_la_SOURCES = configuretableviewdialog.cpp \
contactlistview.cpp \
kaddressbooktableview.cpp
libkaddrbk_tableview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_tableview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEABC) $(LIB_TDEIO) $(LIB_TDEIMPROXY)
+libkaddrbk_tableview_la_LIBADD = $(XXLIBS) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEABC) $(LIB_TDEIO) $(LIB_TDEIMPROXY)
noinst_HEADERS = cardview.h colorlistbox.h configurecardviewdialog.h \
configuretableviewdialog.h contactlistview.h \
diff --git a/kaddressbook/xxport/Makefile.am b/kaddressbook/xxport/Makefile.am
index c91a09451..98dfc332a 100644
--- a/kaddressbook/xxport/Makefile.am
+++ b/kaddressbook/xxport/Makefile.am
@@ -21,33 +21,33 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
$(top_builddir)/libtdepim/libtdepim.la
libkaddrbk_csv_xxport_la_SOURCES = csv_xxport.cpp csvimportdialog.cpp dateparser.cpp
-libkaddrbk_csv_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
+libkaddrbk_csv_xxport_la_LIBADD = $(XXLIBS) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
libkaddrbk_vcard_xxport_la_SOURCES = vcard_xxport.cpp
-libkaddrbk_vcard_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO) \
+libkaddrbk_vcard_xxport_la_LIBADD = $(XXLIBS) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO) \
$(top_builddir)/kaddressbook/libkaddressbook.la \
$(top_builddir)/libtdenetwork/qgpgme/libqgpgme.la
libkaddrbk_kde2_xxport_la_SOURCES = kde2_xxport.cpp
-libkaddrbk_kde2_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
+libkaddrbk_kde2_xxport_la_LIBADD = $(XXLIBS) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
libkaddrbk_bookmark_xxport_la_SOURCES = bookmark_xxport.cpp
-libkaddrbk_bookmark_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
+libkaddrbk_bookmark_xxport_la_LIBADD = $(XXLIBS) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
libkaddrbk_eudora_xxport_la_SOURCES = eudora_xxport.cpp
-libkaddrbk_eudora_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
+libkaddrbk_eudora_xxport_la_LIBADD = $(XXLIBS) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
libkaddrbk_ldif_xxport_la_SOURCES = ldif_xxport.cpp
-libkaddrbk_ldif_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
+libkaddrbk_ldif_xxport_la_LIBADD = $(XXLIBS) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
libkaddrbk_gnokii_xxport_la_SOURCES = gnokii_xxport.cpp
-libkaddrbk_gnokii_xxport_la_LIBADD = $(XPMLIB) $(LIB_GNOKII) $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
+libkaddrbk_gnokii_xxport_la_LIBADD = $(XPMLIB) $(LIB_GNOKII) $(XXLIBS) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
libkaddrbk_opera_xxport_la_SOURCES = opera_xxport.cpp
-libkaddrbk_opera_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
+libkaddrbk_opera_xxport_la_LIBADD = $(XXLIBS) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
libkaddrbk_pab_xxport_la_SOURCES = pab_xxport.cpp pab_mapihd.cpp pab_pablib.cpp
-libkaddrbk_pab_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
+libkaddrbk_pab_xxport_la_LIBADD = $(XXLIBS) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
noinst_HEADERS = csvimportdialog.h
diff --git a/kalarm/kalarmd/Makefile.am b/kalarm/kalarmd/Makefile.am
index 3b8eafffb..885200300 100644
--- a/kalarm/kalarmd/Makefile.am
+++ b/kalarm/kalarmd/Makefile.am
@@ -2,13 +2,13 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kalarm $(all_includes)
noinst_LTLIBRARIES = libkalarmd.la
-libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
libkalarmd_la_LIBADD = $(LIB_TDECORE) $(top_builddir)/libkcal/libkcal.la
libkalarmd_la_SOURCES = alarmdaemoniface.stub alarmguiiface.stub
bin_PROGRAMS = kalarmd
-kalarmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kalarmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kalarmd_LDADD = $(LIB_TDEUI) $(top_builddir)/libkcal/libkcal.la libkalarmd.la
kalarmd_SOURCES = alarmdaemon.cpp admain.cpp adapp.cpp \
adcalendar.cpp adconfigdata.cpp clientinfo.cpp \
diff --git a/kandy/src/Makefile.am b/kandy/src/Makefile.am
index f6187234b..85bbfc862 100644
--- a/kandy/src/Makefile.am
+++ b/kandy/src/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS = kandy kandy_client
INCLUDES = -I$(top_srcdir) $(all_includes)
-kandy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kandy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kandy_LDADD = $(LIB_TDEFILE) -ltdeabc $(top_builddir)/libtdepim/libtdepim.la
kandy_SOURCES = main.cpp kandy.cpp \
cmdpropertiesdialog_base.ui cmdpropertiesdialog.cpp \
@@ -19,7 +19,7 @@ KDE_ICON = kandy
noinst_HEADERS = kandy.h kandyview.h modem.h atcommand.h \
commanditem.h mobilegui.h commandscheduler.h
-kandy_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kandy_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kandy_client_LDADD = $(LIB_TDECORE)
kandy_client_SOURCES = kandy_client.cpp
diff --git a/karm/Makefile.am b/karm/Makefile.am
index 257bf2e0a..38c5ff46a 100644
--- a/karm/Makefile.am
+++ b/karm/Makefile.am
@@ -23,7 +23,7 @@ libkarm_shared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/libtdepim/libtdepim.la $(LIBXSS) -ltdeprint
karm_SOURCES = main.cpp
karm_LDADD = libkarm_shared.la
-karm_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+karm_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
noinst_HEADERS = desktoptracker.h edittaskdialog.h printdialog.h \
idletimedetector.h tdeaccelmenuwatch.h timekard.h \
karmutility.h ktimewidget.h karmstorage.h mainwindow.h \
diff --git a/karm/test/Makefile.am b/karm/test/Makefile.am
index b8da6ca65..5397d57ba 100644
--- a/karm/test/Makefile.am
+++ b/karm/test/Makefile.am
@@ -3,12 +3,12 @@ METASOURCES = AUTO
check_PROGRAMS = runscripts locking
runscripts_SOURCES = script.cpp runscripts.cpp
-runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-runscripts_LDADD = $(LIB_QT) $(LIB_TDECORE)
+runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+runscripts_LDADD = $(LIB_TQT) $(LIB_TDECORE)
locking_SOURCES = locking.cpp lockerthread.cpp
-locking_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-locking_LDADD = $(LIB_QT) $(top_builddir)/libkcal/libkcal.la
+locking_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+locking_LDADD = $(LIB_TQT) $(top_builddir)/libkcal/libkcal.la
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
diff --git a/kgantt/kgantt/Makefile.am b/kgantt/kgantt/Makefile.am
index a21e1dce8..0b629fdfd 100644
--- a/kgantt/kgantt/Makefile.am
+++ b/kgantt/kgantt/Makefile.am
@@ -7,7 +7,7 @@ xQGanttBarViewPort_Events.cpp \
xQGanttBarView.cpp xQGanttListView.cpp KGanttBarConfig.cpp
libkgantt_la_LDFLAGS = -version-info 0:2:0 $(all_libraries) -no-undefined
-libkgantt_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
+libkgantt_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI)
# set the include path for X, qt and KDE
INCLUDES= $(all_includes)
diff --git a/kitchensync/src/Makefile.am b/kitchensync/src/Makefile.am
index 1e6c55a59..acfaf5303 100644
--- a/kitchensync/src/Makefile.am
+++ b/kitchensync/src/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES = -I$(top_srcdir)/kitchensync/src \
bin_PROGRAMS = kitchensync
kitchensync_SOURCES = main.cpp mainwindow.cpp
-kitchensync_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kitchensync_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kitchensync_LDADD = libkitchensync.la
xdg_apps_DATA = kitchensync.desktop
@@ -34,14 +34,14 @@ libkitchensync_la_SOURCES = aboutpage.cpp mainwidget.cpp groupconfigdialog.cpp \
libkitchensync_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
libkitchensync_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEHTML) $(top_builddir)/kitchensync/libqopensync/libqopensync.la \
$(LIB_TDEABC) $(top_builddir)/libtdepim/libtdepim.la $(top_builddir)/libkcal/libkcal.la \
- $(LIB_QT)
+ $(LIB_TQT)
# KPart
kde_module_LTLIBRARIES = libkitchensyncpart.la
libkitchensyncpart_la_SOURCES = part.cpp
libkitchensyncpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkitchensyncpart_la_LIBADD = $(LIB_TDEPARTS) libkitchensync.la $(LIB_QT) $(LIB_TDEIO) $(LIB_TDEHTML) $(LIB_TDEABC) $(LIB_TDECORE) $(LIB_TDEUI)
+libkitchensyncpart_la_LIBADD = $(LIB_TDEPARTS) libkitchensync.la $(LIB_TQT) $(LIB_TDEIO) $(LIB_TDEHTML) $(LIB_TDEABC) $(LIB_TDECORE) $(LIB_TDEUI)
# Resources
kitchensyncdatadir = $(kde_datadir)/kitchensync
diff --git a/kmailcvt/Makefile.am b/kmailcvt/Makefile.am
index 7c49b36aa..84777d75b 100644
--- a/kmailcvt/Makefile.am
+++ b/kmailcvt/Makefile.am
@@ -40,7 +40,7 @@ INCLUDES= $(all_includes)
kmailcvt_METASOURCES = AUTO
# the library search path.
-kmailcvt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kmailcvt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
KDE_ICON=AUTO
diff --git a/kmobile/Makefile.am b/kmobile/Makefile.am
index 249ab533e..75f643cde 100644
--- a/kmobile/Makefile.am
+++ b/kmobile/Makefile.am
@@ -8,7 +8,7 @@ lib_LTLIBRARIES = libkmobiledevice.la libkmobileclient.la
INCLUDES = $(all_includes)
-kmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kmobile_LDADD = $(LIB_TDEFILE) $(LIB_TDEABC) libkmobiledevice.la
kmobile_SOURCES = main.cpp kmobile.cpp kmobileview.cpp kmobileitem.cpp\
pref.cpp kmobileiface.skel kmobile_selectiondialog.ui \
@@ -29,7 +29,7 @@ libkmobileclient_la_LDFLAGS = $(all_libraries) -no-undefined -avoid-version
libkmobileclient_la_LIBADD = $(LIB_TDECORE) -lDCOP
EXTRA_PROGRAMS = testlibkmobile
-testlibkmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testlibkmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testlibkmobile_LDADD = libkmobileclient.la
testlibkmobile_SOURCES = testlibkmobile.cpp
diff --git a/knode/Makefile.am b/knode/Makefile.am
index c2eff0d3a..e427a5d2f 100644
--- a/knode/Makefile.am
+++ b/knode/Makefile.am
@@ -11,13 +11,13 @@ lib_LTLIBRARIES = libknodecommon.la
kde_module_LTLIBRARIES = kcm_knode.la libknodepart.la
libknodepart_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(KDE_RPATH) $(KDE_PLUGIN)
-libknodepart_la_LIBADD = libknodecommon.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim
+libknodepart_la_LIBADD = libknodecommon.la $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim
SUBDIRS = pics filters
bin_PROGRAMS = knode
-knode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+knode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
knode_LDADD = libknodecommon.la
kcm_knode_la_SOURCES = knconfigpages.cpp
diff --git a/knotes/Makefile.am b/knotes/Makefile.am
index 9de836c74..124a60d8d 100644
--- a/knotes/Makefile.am
+++ b/knotes/Makefile.am
@@ -28,14 +28,14 @@ knotes_SOURCES = main.cpp knotesapp.cpp KNotesAppIface.skel
knotes_LDADD = libknote.la libknoteseditor.la libknotesnetwork.la libknotesresources.la \
libknoteslegacy.la libknotesconfig.la libknotesprinting.la $(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/libtdepim/libtdepim.la $(LIB_TDEIO) -ltderesources -ltdeprint -ltdeutils
-knotes_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+knotes_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
knotes_COMPILE_FIRST = knoteconfig.h
kde_module_LTLIBRARIES = knotes_local.la
knotes_local_la_SOURCES = resourcelocal_plugin.cpp
knotes_local_la_LDFLAGS = $(KDE_LDFLAGS) $(all_libraries) -module $(KDE_PLUGIN)
knotes_local_la_LIBADD = libknotesresources.la libknotesconfig.la libknotesprinting.la \
- $(top_builddir)/libkcal/libkcal.la -ltdeprint $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -ltderesources
+ $(top_builddir)/libkcal/libkcal.la -ltdeprint $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -ltderesources
METASOURCES = AUTO
diff --git a/kode/Makefile.am b/kode/Makefile.am
index f20e86dc5..692e52fe6 100644
--- a/kode/Makefile.am
+++ b/kode/Makefile.am
@@ -14,7 +14,7 @@ libkode_la_LIBADD = -ltdecore
bin_PROGRAMS = kode
-kode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kode_LDADD = libkode.la -ltdeabc
kode_SOURCES = kodemain.cpp
diff --git a/kode/kwsdl/Makefile.am b/kode/kwsdl/Makefile.am
index 86716e47c..976dd2346 100644
--- a/kode/kwsdl/Makefile.am
+++ b/kode/kwsdl/Makefile.am
@@ -11,7 +11,7 @@ libwsdl_la_LIBADD = -ltdecore schema/libschema.la
bin_PROGRAMS = kwsdl_compiler
-kwsdl_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kwsdl_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kwsdl_compiler_LDADD = ../libkode.la libwsdl.la
kwsdl_compiler_SOURCES = compiler.cpp converter.cpp creator.cpp main.cpp \
namemapper.cpp
diff --git a/kode/kwsdl/kung/Makefile.am b/kode/kwsdl/kung/Makefile.am
index cbff637ac..61a8b1c9e 100644
--- a/kode/kwsdl/kung/Makefile.am
+++ b/kode/kwsdl/kung/Makefile.am
@@ -1,7 +1,7 @@
INCLUDES = -I$(top_srcdir) -I.. -I$(top_srcdir)/kode -I$(top_srcdir)/kode/kwsdl -I$(top_srcdir)/libtdepim $(all_includes)
bin_PROGRAMS = kung
-kung_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kung_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kung_SOURCES = binaryinputfield.cpp boolinputfield.cpp complexbaseinputfield.cpp dateinputfield.cpp dispatcher.cpp \
doubleinputfield.cpp enuminputfield.cpp generalconversationmanager.cpp \
inputdialog.cpp inputfield.cpp inputfieldfactory.cpp \
diff --git a/kode/kwsdl/schema/Makefile.am b/kode/kwsdl/schema/Makefile.am
index bdde93a4d..2e93c3caa 100644
--- a/kode/kwsdl/schema/Makefile.am
+++ b/kode/kwsdl/schema/Makefile.am
@@ -8,7 +8,7 @@ libschema_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
libschema_la_LIBADD = -lqt-mt -ltdecore -ltdeio
#bin_PROGRAMS = schematest
-#schematest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+#schematest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
#schematest_SOURCES = main.cpp
#schematest_LDADD = libschema.la
diff --git a/kode/kwsdl/tests/google/Makefile.am b/kode/kwsdl/tests/google/Makefile.am
index 68f084a34..9dd839c54 100644
--- a/kode/kwsdl/tests/google/Makefile.am
+++ b/kode/kwsdl/tests/google/Makefile.am
@@ -5,5 +5,5 @@ bin_PROGRAMS = googletest
googletest_SOURCES = main.cc googlesearch.cc transport.cpp resultelementarray.cpp directorycategoryarray.cpp googlesearchresult.cpp directorycategory.cpp resultelement.cpp serializer.cpp googlesearchservice.cpp
googletest_LDADD = -ltdecore -ltdeio
-googletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+googletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
diff --git a/kode/kwsdl/wscl/Makefile.am b/kode/kwsdl/wscl/Makefile.am
index 782d912d5..5931994aa 100644
--- a/kode/kwsdl/wscl/Makefile.am
+++ b/kode/kwsdl/wscl/Makefile.am
@@ -7,7 +7,7 @@ libwscl_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
libwscl_la_LIBADD = -lqt-mt
#bin_PROGRAMS = wscltest
-#wscltest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+#wscltest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
#wscltest_SOURCES = main.cpp
#wscltest_LDADD = libwscl.la
diff --git a/kode/kxml_compiler/Makefile.am b/kode/kxml_compiler/Makefile.am
index a8352a38b..7ba5e62df 100644
--- a/kode/kxml_compiler/Makefile.am
+++ b/kode/kxml_compiler/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libtdepim $(all_includes)
bin_PROGRAMS = kxml_compiler
-kxml_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kxml_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kxml_compiler_LDADD = ../libkode.la -ltdecore
kxml_compiler_SOURCES = parser.cpp creator.cpp kxml_compiler.cpp
diff --git a/konsolekalendar/Makefile.am b/konsolekalendar/Makefile.am
index aa549271b..24e4caba3 100644
--- a/konsolekalendar/Makefile.am
+++ b/konsolekalendar/Makefile.am
@@ -13,7 +13,7 @@ konsolekalendar_SOURCES = konsolekalendarepoch.cpp konsolekalendardelete.cpp \
konsolekalendaradd.cpp konsolekalendarexports.cpp konsolekalendar.cpp \
stdcalendar.cpp main.cpp
konsolekalendar_LDADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la
-konsolekalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+konsolekalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
appsdir = $(kde_appsdir)/Utilities
xdg_apps_DATA = konsolekalendar.desktop
diff --git a/kontact/src/Makefile.am b/kontact/src/Makefile.am
index 46fd81ef3..3ed029264 100644
--- a/kontact/src/Makefile.am
+++ b/kontact/src/Makefile.am
@@ -10,7 +10,7 @@ libkontact_la_SOURCES = prefs.kcfgc
bin_PROGRAMS = kontact
kontact_METASOURCES = AUTO
-kontact_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kontact_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kontact_LDADD = $(top_builddir)/libtdepim/libtdepim.la \
$(top_builddir)/kontact/interfaces/libkpinterfaces.la libkontact.la \
$(LIB_TDEPARTS) $(LIB_TDEUTILS) $(LIB_TDEHTML)
diff --git a/korganizer/Makefile.am b/korganizer/Makefile.am
index 84fc724c6..398a31972 100644
--- a/korganizer/Makefile.am
+++ b/korganizer/Makefile.am
@@ -14,7 +14,7 @@ INCLUDES = \
bin_PROGRAMS = korganizer
-korganizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+korganizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
korganizer_LDADD = libkorganizer.la
korganizer_SOURCES = main.cpp korganizer.cpp koapp.cpp
korganizer_COMPILE_FIRST = koprefs_base.h
@@ -29,19 +29,19 @@ kcm_korganizer_la_LIBADD = libkorganizer.la $(top_builddir)/libtdepim/libtdepim.
kcm_korganizer_la_COMPILE_FIRST = koprefs_base.h kogroupwareprefspage.h
libkorganizerpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-libkorganizerpart_la_LIBADD = libkorganizer.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEPARTS) $(LIB_TDEIO) $(LIB_TDEHTML) $(LIB_TDEUI) -L$(top_builddir)/libtdepim/ -ltdepim -L$(top_builddir)/libkcal/ -lkcal -lkorganizer_calendar
+libkorganizerpart_la_LIBADD = libkorganizer.la $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEPARTS) $(LIB_TDEIO) $(LIB_TDEHTML) $(LIB_TDEUI) -L$(top_builddir)/libtdepim/ -ltdepim -L$(top_builddir)/libkcal/ -lkcal -lkorganizer_calendar
libkorganizerpart_la_SOURCES = korganizer_part.cpp
libkorganizerpart_la_COMPILE_FIRST = publishdialog_base.h koprefs_base.h
check_PROGRAMS = korgplugins timezone
-korgplugins_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+korgplugins_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
korgplugins_LDADD = libkorganizer.la $(LIB_TDESYCOCA)
korgplugins_SOURCES = korgplugins.cpp
korgplugins_COMPILE_FIRST = koprefs_base.h
-timezone_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+timezone_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
timezone_LDADD = libkorganizer.la $(LIB_TDESYCOCA)
timezone_SOURCES = timezone.cpp
timezone_COMPILE_FIRST = koprefs_base.h
diff --git a/korganizer/korgac/Makefile.am b/korganizer/korgac/Makefile.am
index 910090627..b32b8f017 100644
--- a/korganizer/korgac/Makefile.am
+++ b/korganizer/korgac/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/korganizer $(all_includes)
bin_PROGRAMS = korgac
-korgac_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+korgac_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
korgac_LDADD = $(LIB_TDEUI) \
$(top_builddir)/korganizer/libkorganizer_eventviewer.la
korgac_SOURCES = korgacmain.cpp alarmdialog.cpp \
@@ -11,7 +11,7 @@ korgac_SOURCES = korgacmain.cpp alarmdialog.cpp \
check_PROGRAMS = testalarmdlg
-testalarmdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testalarmdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testalarmdlg_LDADD = $(LIB_TDEUI) $(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/korganizer/libkorganizer_eventviewer.la
testalarmdlg_SOURCES = testalarmdlg.cpp alarmdialog.cpp
diff --git a/korganizer/plugins/datenums/Makefile.am b/korganizer/plugins/datenums/Makefile.am
index 3810225b4..dc4de791e 100644
--- a/korganizer/plugins/datenums/Makefile.am
+++ b/korganizer/plugins/datenums/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libkorg_datenums.la
libkorg_datenums_la_SOURCES = configdialog.cpp datenums.cpp
libkorg_datenums_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries)
-libkorg_datenums_la_LIBADD = $(top_builddir)/korganizer/libkorganizer.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
+libkorg_datenums_la_LIBADD = $(top_builddir)/korganizer/libkorganizer.la $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI)
noinst_HEADERS = datenums.h
diff --git a/korganizer/plugins/exchange/Makefile.am b/korganizer/plugins/exchange/Makefile.am
index d1edf5baa..cc52a03d8 100644
--- a/korganizer/plugins/exchange/Makefile.am
+++ b/korganizer/plugins/exchange/Makefile.am
@@ -15,7 +15,7 @@ libkorg_exchange_la_SOURCES = exchange.cpp exchangedialog.cpp exchangeconfig.cp
libkorg_exchange_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries)
libkorg_exchange_la_LIBADD = $(top_builddir)/korganizer/libkorganizer.la \
$(top_builddir)/libkpimexchange/libkpimexchange.la \
- $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) \
+ $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) \
$(top_builddir)/libkcal/libkcal.la
noinst_HEADERS = exchange.h exchangedialog.h exchangeconfig.h
diff --git a/korganizer/plugins/hebrew/Makefile.am b/korganizer/plugins/hebrew/Makefile.am
index 8324e6e38..20097ca5a 100644
--- a/korganizer/plugins/hebrew/Makefile.am
+++ b/korganizer/plugins/hebrew/Makefile.am
@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libkorg_hebrew.la
libkorg_hebrew_la_SOURCES = hebrew.cpp configdialog.cpp holiday.cpp parsha.cpp converter.cpp
libkorg_hebrew_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries)
-libkorg_hebrew_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
+libkorg_hebrew_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI)
noinst_HEADERS = hebrew.h configdialog.h parsha.h converter.h holiday.h
diff --git a/korganizer/plugins/printing/journal/Makefile.am b/korganizer/plugins/printing/journal/Makefile.am
index b2a1e2fb4..442d1816e 100644
--- a/korganizer/plugins/printing/journal/Makefile.am
+++ b/korganizer/plugins/printing/journal/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libkorg_journalprint.la
libkorg_journalprint_la_SOURCES =calprintjournalconfig_base.ui journalprint.cpp
libkorg_journalprint_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries)
-libkorg_journalprint_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la -L$(top_builddir)/libtdepim/ -ltdepim
+libkorg_journalprint_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la -L$(top_builddir)/libtdepim/ -ltdepim
noinst_HEADERS =
diff --git a/korganizer/plugins/printing/year/Makefile.am b/korganizer/plugins/printing/year/Makefile.am
index 5021550f6..54055ab3f 100644
--- a/korganizer/plugins/printing/year/Makefile.am
+++ b/korganizer/plugins/printing/year/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libkorg_yearlyprint.la
libkorg_yearlyprint_la_SOURCES =calprintyearconfig_base.ui yearprint.cpp
libkorg_yearlyprint_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries)
-libkorg_yearlyprint_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPRINT) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la
+libkorg_yearlyprint_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPRINT) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la
noinst_HEADERS =
diff --git a/korn/Makefile.am b/korn/Makefile.am
index bed6770d6..295fa1bad 100644
--- a/korn/Makefile.am
+++ b/korn/Makefile.am
@@ -3,7 +3,7 @@ KDE_CXXFLAGS = $(USE_RTTI)
INCLUDES = -I$(top_srcdir)/libkmime \
$(all_includes)
#INCLUDES = -I$(top_srcdir)/mimelib -I$(top_srcdir)/libkmime $(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
diff --git a/korn/tdeconf_update/Makefile.am b/korn/tdeconf_update/Makefile.am
index a30fb244d..f0466a8a5 100644
--- a/korn/tdeconf_update/Makefile.am
+++ b/korn/tdeconf_update/Makefile.am
@@ -8,5 +8,5 @@ tdeconf_PROGRAMS = korn-3-4-config_change
tdeconfdir = $(libdir)/tdeconf_update_bin
korn_3_4_config_change_SOURCES = korn-3-4-config_change.cpp
-korn_3_4_config_change_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-korn_3_4_config_change_LDADD = $(LIB_QT)
+korn_3_4_config_change_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+korn_3_4_config_change_LDADD = $(LIB_TQT)
diff --git a/ktnef/gui/Makefile.am b/ktnef/gui/Makefile.am
index ebaa64077..c20c86124 100644
--- a/ktnef/gui/Makefile.am
+++ b/ktnef/gui/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = pics
bin_PROGRAMS = ktnef
-ktnef_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+ktnef_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
ktnef_LDADD = $(LIB_TDEFILE) $(top_builddir)/ktnef/lib/libktnef.la
ktnef_SOURCES = ktnefmain.cpp ktnefview.cpp attachpropertydialogbase.ui \
attachpropertydialog.cpp messagepropertydialog.cpp \
diff --git a/ktnef/tests/Makefile.am b/ktnef/tests/Makefile.am
index 6a6cecbee..b9bcc481d 100644
--- a/ktnef/tests/Makefile.am
+++ b/ktnef/tests/Makefile.am
@@ -4,7 +4,7 @@ LDADD = ../lib/libktnef.la $(LIB_TDECORE)
check_PROGRAMS = parsertest
TESTS = parsertest
-parsertest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+parsertest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
parsertest_SOURCES = parsertest.cpp
METASOURCES = AUTO
diff --git a/libemailfunctions/Makefile.am b/libemailfunctions/Makefile.am
index 7782383fe..f631afa38 100644
--- a/libemailfunctions/Makefile.am
+++ b/libemailfunctions/Makefile.am
@@ -7,7 +7,7 @@ libemailfunctions_la_SOURCES = email.cpp idmapper.cpp kasciistricmp.cpp \
libemailfunctions_la_LDFLAGS = $(all_libraries) -no-undefined
## Since this is a noinst library, in case of --enable-closure we need
## to link it explicitly to the libraries that it uses.
-libemailfunctions_la_LIBADD = ../libkmime/libkmime.la $(LIB_QT) $(LIB_TDECORE)
+libemailfunctions_la_LIBADD = ../libkmime/libkmime.la $(LIB_TQT) $(LIB_TDECORE)
emailfunctionsincludedir = $(includedir)/libemailfunctions
emailfunctionsinclude_HEADERS = idmapper.h
diff --git a/libemailfunctions/tests/Makefile.am b/libemailfunctions/tests/Makefile.am
index 05d3b8207..3796f08a3 100644
--- a/libemailfunctions/tests/Makefile.am
+++ b/libemailfunctions/tests/Makefile.am
@@ -4,10 +4,10 @@ LDADD = ../libemailfunctions.la ../../libkmime/libkmime.la $(LIB_TDECORE)
check_PROGRAMS = testidmapper testemail
TESTS = testemail
-testidmapper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testidmapper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testidmapper_SOURCES = testidmapper.cpp
-testemail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testemail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testemail_SOURCES = testemail.cpp
METASOURCES = AUTO
diff --git a/libkcal/Makefile.am b/libkcal/Makefile.am
index 0dc282018..ccb6dc046 100644
--- a/libkcal/Makefile.am
+++ b/libkcal/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = -I$(srcdir)/versit -I$(top_srcdir)/ \
$(all_includes)
lib_LTLIBRARIES = libkcal.la
-libkcal_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 2:0:0 $(LIB_QT) -ltdecore
+libkcal_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 2:0:0 $(LIB_TQT) -ltdecore
libkcal_la_LIBADD = versit/libversit.la $(LIB_TDEIO) \
-lical -licalss \
$(top_builddir)/ktnef/lib/libktnef.la \
@@ -54,11 +54,11 @@ libkcalinclude_HEADERS = alarm.h attachment.h attendee.h calendar.h \
kde_module_LTLIBRARIES = kcal_local.la kcal_localdir.la
kcal_local_la_SOURCES = resourcelocal_plugin.cpp
-kcal_local_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore
+kcal_local_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore
kcal_local_la_LIBADD = libkcal.la
kcal_localdir_la_SOURCES = resourcelocaldir_plugin.cpp
-kcal_localdir_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore
+kcal_localdir_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore
kcal_localdir_la_LIBADD = libkcal.la
EXTRA_PROGRAMS = convertqtopia
diff --git a/libkcal/tests/Makefile.am b/libkcal/tests/Makefile.am
index 81658ad56..b9b1cc25a 100644
--- a/libkcal/tests/Makefile.am
+++ b/libkcal/tests/Makefile.am
@@ -25,60 +25,60 @@ check_PROGRAMS = testtostring \
METASOURCES = AUTO
testincidence_SOURCES = testincidence.cpp
-testincidence_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testincidence_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testincidence_LDADD = ../libkcal.la
testcalendar_SOURCES = testcalendar.cpp
-testcalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testcalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testcalendar_LDADD = ../libkcal.la
testtostring_SOURCES = testtostring.cpp
-testtostring_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testtostring_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testtostring_LDADD = ../libkcal.la
fbrecurring_SOURCES = fbrecurring.cpp
-fbrecurring_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+fbrecurring_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
fbrecurring_LDADD = ../libkcal.la
readandwrite_SOURCES = readandwrite.cpp
-readandwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+readandwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
readandwrite_LDADD = ../libkcal.la
testresource_SOURCES = testresource.cpp
-testresource_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testresource_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testresource_LDADD = ../libkcal.la
testrecurrence_SOURCES = testrecurrence.cpp
-testrecurrence_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testrecurrence_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testrecurrence_LDADD = ../libkcal.la
testrecurprevious_SOURCES = testrecurprevious.cpp
-testrecurprevious_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testrecurprevious_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testrecurprevious_LDADD = ../libkcal.la
testrecurson_SOURCES = testrecurson.cpp
-testrecurson_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testrecurson_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testrecurson_LDADD = ../libkcal.la
testrecurrencetype_SOURCES = testrecurrencetype.cpp
-testrecurrencetype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testrecurrencetype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testrecurrencetype_LDADD = ../libkcal.la
testvcalexport_SOURCES = testvcalexport.cpp
-testvcalexport_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testvcalexport_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testvcalexport_LDADD = ../libkcal.la
testfields_SOURCES = testfields.cpp
-testfields_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testfields_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testfields_LDADD = ../libkcal.la
testfields_CXXFLAGS= -DINPUT='"$(srcdir)/data/test_pilot.ics"'
testfb_SOURCES = testfb.cpp
-testfb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testfb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testfb_LDADD = ../libkcal.la
testcalselectdialog_SOURCES = testcalselectdialog.cpp
-testcalselectdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testcalselectdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testcalselectdialog_LDADD = ../libkcal.la
TESTFILES = test1.ics test2.ics test3.ics test4.ics test5.ics test_Mozilla.ics
diff --git a/libtdenetwork/qgpgme/Makefile.am b/libtdenetwork/qgpgme/Makefile.am
index 108760a05..6f1964a56 100644
--- a/libtdenetwork/qgpgme/Makefile.am
+++ b/libtdenetwork/qgpgme/Makefile.am
@@ -9,7 +9,7 @@ qgpgme_HEADERS = eventloopinteractor.h dataprovider.h
libqgpgme_la_SOURCES = eventloopinteractor.cpp dataprovider.cpp
libqgpgme_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
-libqgpgme_la_LIBADD = $(LIB_QT) ../gpgmepp/libgpgme++.la
+libqgpgme_la_LIBADD = $(LIB_TQT) ../gpgmepp/libgpgme++.la
METASOURCES = AUTO
diff --git a/libtdenetwork/qgpgme/tests/Makefile.am b/libtdenetwork/qgpgme/tests/Makefile.am
index 5c2436d04..3d53c083a 100644
--- a/libtdenetwork/qgpgme/tests/Makefile.am
+++ b/libtdenetwork/qgpgme/tests/Makefile.am
@@ -6,4 +6,4 @@ TESTS = $(check_PROGRAMS)
dataprovidertest_SOURCES = dataprovidertest.cpp
-LDADD = ../libqgpgme.la #?$(LIB_QT)
+LDADD = ../libqgpgme.la #?$(LIB_TQT)
diff --git a/libtdepim/Makefile.am b/libtdepim/Makefile.am
index cbee9ed68..4a4d026bc 100644
--- a/libtdepim/Makefile.am
+++ b/libtdepim/Makefile.am
@@ -42,7 +42,7 @@ MailTransportServiceIface_DIR = $(srcdir)/interfaces
AddressBookServiceIface_DIR = $(srcdir)/interfaces
-libtdepim_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0 $(LIB_QT) -ltdecore
+libtdepim_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0 $(LIB_TQT) -ltdecore
libtdepim_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/libemailfunctions/libemailfunctions.la \
$(LIB_TDEIO) $(LIB_TDEABC) $(LIB_TDEPARTS) $(LIB_TDEIMPROXY) $(LIB_POLL) $(LIB_QUI)
@@ -52,7 +52,7 @@ include_HEADERS = tdepimmacros.h kpimprefs.h
AM_CXXFLAGS = -DQT_PLUGIN
kde_widget_LTLIBRARIES = tdepimwidgets.la
-tdepimwidgets_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries) $(LIB_QT) -ltdecore
+tdepimwidgets_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries) $(LIB_TQT) -ltdecore
tdepimwidgets_la_LIBADD = $(LIB_TDEIO) libtdepim.la
tdepimwidgets_la_SOURCES = tdepimwidgets.cpp
diff --git a/libtdepim/cfgc/Makefile.am b/libtdepim/cfgc/Makefile.am
index 64815d272..ea62113c0 100644
--- a/libtdepim/cfgc/Makefile.am
+++ b/libtdepim/cfgc/Makefile.am
@@ -3,11 +3,11 @@ AM_CPPFLAGS = -I$(top_builddir)/libtdepim -I$(top_srcdir) $(all_includes)
check_PROGRAMS = example
#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 = ../libtdepim.la $(LIB_TDECORE)
example_SOURCES = example.cpp exampleprefs_base.kcfgc
-#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 = ../libtdepim.la $(LIB_TDECORE)
#autoexample_SOURCES = general_base.ui myoptions_base.ui autoexample.cpp
diff --git a/libtdepim/komposer/core/tests/Makefile.am b/libtdepim/komposer/core/tests/Makefile.am
index a61744968..0a2c666ec 100644
--- a/libtdepim/komposer/core/tests/Makefile.am
+++ b/libtdepim/komposer/core/tests/Makefile.am
@@ -5,15 +5,15 @@ check_PROGRAMS = testfactory testmanager testkomposer
METASOURCES = AUTO
testfactory_SOURCES = main.cpp managertest.cpp
-testfactory_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testfactory_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testfactory_LDADD = ../libkomposer.la
testmanager_SOURCES = testmanager.cpp
-testmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testmanager_LDADD = ../libkomposer.la
testkomposer_SOURCES = testkomposer.cpp
-testkomposer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testkomposer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testkomposer_LDADD = ../libkomposer.la
check: testfactory
diff --git a/libtdepim/komposer/test/Makefile.am b/libtdepim/komposer/test/Makefile.am
index 68fc85f4b..f0558a154 100644
--- a/libtdepim/komposer/test/Makefile.am
+++ b/libtdepim/komposer/test/Makefile.am
@@ -1,6 +1,6 @@
AM_CPPFLAGS = -I$(top_srcdir) -I../core $(all_includes)
LDADD = $(LIB_TDEPARTS) ../core/libkomposer.la
-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 = test
diff --git a/libtdepim/tdepartsdesignerplugin/Makefile.am b/libtdepim/tdepartsdesignerplugin/Makefile.am
index 8ca60702c..2334cf78d 100644
--- a/libtdepim/tdepartsdesignerplugin/Makefile.am
+++ b/libtdepim/tdepartsdesignerplugin/Makefile.am
@@ -3,6 +3,6 @@ METASOURCES = AUTO
INCLUDES = $(all_includes)
kde_widget_LTLIBRARIES = tdepartsdesignerplugin.la
-tdepartsdesignerplugin_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries) $(LIB_QT) -ltdecore -ltdeio
+tdepartsdesignerplugin_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries) $(LIB_TQT) -ltdecore -ltdeio
tdepartsdesignerplugin_la_LIBADD = $(LIB_TDEPARTS)
tdepartsdesignerplugin_la_SOURCES = tdepartsdesignerplugin.cpp
diff --git a/libtdepim/tests/Makefile.am b/libtdepim/tests/Makefile.am
index 0af1a25ab..0cc514362 100644
--- a/libtdepim/tests/Makefile.am
+++ b/libtdepim/tests/Makefile.am
@@ -1,5 +1,5 @@
AM_CPPFLAGS = -I$(top_builddir)/libtdepim -I$(top_srcdir)/libtdepim -I$(top_srcdir)/libemailfunctions $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
LDADD = ../libtdepim.la $(LIB_TDECORE)
check_PROGRAMS = testwizard testaddresseelineedit \
@@ -29,7 +29,7 @@ testkincidencechooser_SOURCES = testkincidencechooser.cpp
METASOURCES = AUTO
-#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 = ../libtdepim.la $(LIB_TDECORE)
#example_SOURCES = example.cpp exampleprefs_base.kcfgc
diff --git a/plugins/kmail/bodypartformatter/Makefile.am b/plugins/kmail/bodypartformatter/Makefile.am
index 5c546eff6..5cdc84ac9 100644
--- a/plugins/kmail/bodypartformatter/Makefile.am
+++ b/plugins/kmail/bodypartformatter/Makefile.am
@@ -17,7 +17,7 @@ kde_module_LTLIBRARIES = libkmail_bodypartformatter_text_vcard.la \
libkmail_bodypartformatter_text_vcard_la_SOURCES = text_vcard.cpp
libkmail_bodypartformatter_text_vcard_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
-libkmail_bodypartformatter_text_vcard_la_LIBADD = $(LIB_QT) $(LIB_TDEABC) \
+libkmail_bodypartformatter_text_vcard_la_LIBADD = $(LIB_TQT) $(LIB_TDEABC) \
../../../libtdepim/libtdepim.la \
../../../libkmime/libkmime.la \
../../../libemailfunctions/libemailfunctions.la
@@ -30,14 +30,14 @@ libkmail_bodypartformatter_text_calendar_la_SOURCES = \
kcalendariface.stub
libkmail_bodypartformatter_text_calendar_la_LDFLAGS = \
$(all_libraries) -module $(KDE_PLUGIN) -no-undefined
-libkmail_bodypartformatter_text_calendar_la_LIBADD = $(LIB_QT) $(LIB_TDEABC) \
+libkmail_bodypartformatter_text_calendar_la_LIBADD = $(LIB_TQT) $(LIB_TDEABC) \
$(top_builddir)/libkcal/libkcal.la $(top_builddir)/kmail/libkmailprivate.la
kcalendariface_DIR = $(top_srcdir)/korganizer
libkmail_bodypartformatter_text_xdiff_la_SOURCES = text_xdiff.cpp
libkmail_bodypartformatter_text_xdiff_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-libkmail_bodypartformatter_text_xdiff_la_LIBADD = $(LIB_QT)
+libkmail_bodypartformatter_text_xdiff_la_LIBADD = $(LIB_TQT)
linkdir = $(kde_datadir)/kmail/plugins/bodypartformatter
diff --git a/tdeabc/frontend/Makefile.am b/tdeabc/frontend/Makefile.am
index 3b97d9100..adcaac6a3 100644
--- a/tdeabc/frontend/Makefile.am
+++ b/tdeabc/frontend/Makefile.am
@@ -4,7 +4,7 @@ METASOURCES = AUTO
bin_PROGRAMS = tdeabcfrontend
-tdeabcfrontend_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdeabcfrontend_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
tdeabcfrontend_LDADD = -ltdeabc $(LIB_TDECORE)
tdeabcfrontend_SOURCES = main.cpp mainWindow.ui
diff --git a/tdeabc/tdeabc2mutt/Makefile.am b/tdeabc/tdeabc2mutt/Makefile.am
index d921711b7..91fc39b66 100644
--- a/tdeabc/tdeabc2mutt/Makefile.am
+++ b/tdeabc/tdeabc2mutt/Makefile.am
@@ -4,7 +4,7 @@ METASOURCES = AUTO
bin_PROGRAMS = tdeabc2mutt
-tdeabc2mutt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdeabc2mutt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
tdeabc2mutt_LDADD = -ltdeabc $(LIB_TDECORE)
tdeabc2mutt_SOURCES = tdeabc2mutt.cpp main.cpp
diff --git a/tdeabc/tdeabcdistlistupdater/Makefile.am b/tdeabc/tdeabcdistlistupdater/Makefile.am
index b60e00653..236212ba6 100644
--- a/tdeabc/tdeabcdistlistupdater/Makefile.am
+++ b/tdeabc/tdeabcdistlistupdater/Makefile.am
@@ -4,7 +4,7 @@ METASOURCES = AUTO
bin_PROGRAMS = tdeabcdistlistupdater
-tdeabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdeabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
tdeabcdistlistupdater_LDADD = $(LIB_TDEABC) $(top_builddir)/libtdepim/libtdepim.la
tdeabcdistlistupdater_SOURCES = tdeabcdistlistupdater.cpp
diff --git a/tdefile-plugins/ics/Makefile.am b/tdefile-plugins/ics/Makefile.am
index 8cb1a415a..856afadaa 100644
--- a/tdefile-plugins/ics/Makefile.am
+++ b/tdefile-plugins/ics/Makefile.am
@@ -11,7 +11,7 @@ noinst_HEADERS = tdefile_ics.h
kde_module_LTLIBRARIES = tdefile_ics.la
tdefile_ics_la_SOURCES = tdefile_ics.cpp
-tdefile_ics_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore
+tdefile_ics_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore
tdefile_ics_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(LIB_TDESYCOCA)
diff --git a/tdefile-plugins/palm-databases/Makefile.am b/tdefile-plugins/palm-databases/Makefile.am
index 7711d1924..490afba9e 100644
--- a/tdefile-plugins/palm-databases/Makefile.am
+++ b/tdefile-plugins/palm-databases/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = tdefile_palm.h
kde_module_LTLIBRARIES = tdefile_palm.la
tdefile_palm_la_SOURCES = tdefile_palm.cpp
-tdefile_palm_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore
+tdefile_palm_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore
tdefile_palm_la_LIBADD = $(LIB_TDESYCOCA) $(PISOCK_LIB)
# let automoc handle all of the meta source files (moc)
diff --git a/tdefile-plugins/vcf/Makefile.am b/tdefile-plugins/vcf/Makefile.am
index 5b210eed0..54573423b 100644
--- a/tdefile-plugins/vcf/Makefile.am
+++ b/tdefile-plugins/vcf/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = tdefile_vcf.h
kde_module_LTLIBRARIES = tdefile_vcf.la
tdefile_vcf_la_SOURCES = tdefile_vcf.cpp
-tdefile_vcf_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore
+tdefile_vcf_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore
tdefile_vcf_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDEABC)
# let automoc handle all of the meta source files (moc)
diff --git a/tdeioslave/mbox/Makefile.am b/tdeioslave/mbox/Makefile.am
index 4dea4644a..b95ae1b5e 100644
--- a/tdeioslave/mbox/Makefile.am
+++ b/tdeioslave/mbox/Makefile.am
@@ -12,7 +12,7 @@ tdeio_mbox_la_SOURCES = \
readmbox.cc \
stat.cc \
urlinfo.cc
-tdeio_mbox_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE)
+tdeio_mbox_la_LIBADD = $(LIB_TDEIO) $(LIB_TQT) $(LIB_TDECORE)
tdeio_mbox_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN)
noinst_HEADERS = \
diff --git a/tdeioslave/sieve/Makefile.am b/tdeioslave/sieve/Makefile.am
index 0db2e374d..aa711b917 100644
--- a/tdeioslave/sieve/Makefile.am
+++ b/tdeioslave/sieve/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(all_includes)
kde_module_LTLIBRARIES = tdeio_sieve.la
tdeio_sieve_la_SOURCES = sieve.cpp
-tdeio_sieve_la_LIBADD = $(LIB_TDEIO) $(SASL2_LIBS) $(LIB_QT) $(LIB_TDECORE)
+tdeio_sieve_la_LIBADD = $(LIB_TDEIO) $(SASL2_LIBS) $(LIB_TQT) $(LIB_TDECORE)
tdeio_sieve_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = sieve.h
diff --git a/tderesources/featureplan/Makefile.am b/tderesources/featureplan/Makefile.am
index 9e85cd054..d0593df07 100644
--- a/tderesources/featureplan/Makefile.am
+++ b/tderesources/featureplan/Makefile.am
@@ -28,12 +28,12 @@ kcal_service_DATA = kcal_resourcefeatureplan.desktop
check_PROGRAMS = dumpfeaturelist benchmarkfeaturelist
-dumpfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+dumpfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
dumpfeaturelist_LDADD = libfeatureplancommon.la $(LIB_TDECORE)
dumpfeaturelist_SOURCES = dumpfeaturelist.cpp
dumpfeaturelist_COMPILE_FIRST = kde-features.h
-benchmarkfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+benchmarkfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
benchmarkfeaturelist_LDADD = libfeatureplancommon.la $(LIB_TDECORE)
benchmarkfeaturelist_SOURCES = benchmarkfeaturelist.cpp
benchmarkfeaturelist_COMPILE_FIRST = kde-features.h
diff --git a/tderesources/groupwise/soap/Makefile.am b/tderesources/groupwise/soap/Makefile.am
index 7ec469247..3cdcd363b 100644
--- a/tderesources/groupwise/soap/Makefile.am
+++ b/tderesources/groupwise/soap/Makefile.am
@@ -5,7 +5,7 @@ KDE_CXXFLAGS = -Wno-non-virtual-dtor
check_PROGRAMS = soapdebug
-soapdebug_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+soapdebug_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
soapdebug_LDADD = libgwsoap.la -ltdecore \
$(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/libtdepim/libtdepim.la
diff --git a/tderesources/scalix/scalixadmin/Makefile.am b/tderesources/scalix/scalixadmin/Makefile.am
index 0758ccfc2..30ddfd867 100644
--- a/tderesources/scalix/scalixadmin/Makefile.am
+++ b/tderesources/scalix/scalixadmin/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS = scalixadmin
INCLUDES = $(all_includes)
-scalixadmin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+scalixadmin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
scalixadmin_LDADD = $(LIB_TDEABC)
scalixadmin_SOURCES = main.cpp mainwindow.cpp passwordpage.cpp settings.cpp jobs.cpp \
otherusermanager.cpp otheruserview.cpp otheruserpage.cpp ldapview.cpp ldapdialog.cpp \
diff --git a/tderesources/slox/Makefile.am b/tderesources/slox/Makefile.am
index 319041882..860c24bf6 100644
--- a/tderesources/slox/Makefile.am
+++ b/tderesources/slox/Makefile.am
@@ -34,7 +34,7 @@ tdeabc_slox_la_LIBADD = libtdeabc_slox.la
EXTRA_PROGRAMS = testsloxaccounts
-testsloxaccounts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testsloxaccounts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testsloxaccounts_LDADD = libkslox.la
testsloxaccounts_SOURCES = testsloxaccounts.cpp
diff --git a/wizards/Makefile.am b/wizards/Makefile.am
index bdb4e29ee..25d22f0ad 100644
--- a/wizards/Makefile.am
+++ b/wizards/Makefile.am
@@ -19,7 +19,7 @@ kde_module_LTLIBRARIES = libegroupwarewizard.la libsloxwizard.la \
libscalixwizard.la
-groupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+groupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
groupwarewizard_LDADD = libegroupwarewizard.la libsloxwizard.la $(LIB_TDEUI) \
libkolabwizard.la \
libexchangewizard.la \
@@ -39,7 +39,7 @@ libkolabwizard_la_SOURCES = kolabwizard.cpp kmailchanges.cpp kolabconfig.kcfgc \
kolabkmailchanges.cpp
kolabwizard_LDADD = libkolabwizard.la $(LIB_TDEUI)
-kolabwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kolabwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kolabwizard_SOURCES = kolabmain.cpp
# eGroupware
@@ -53,7 +53,7 @@ libegroupwarewizard_la_LIBADD = $(top_builddir)/tderesources/egroupware/libtdeab
$(LIB_TDEUI)
egroupwarewizard_LDADD = libegroupwarewizard.la
-egroupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+egroupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
egroupwarewizard_SOURCES = egroupwaremain.cpp
# SLOX
@@ -64,7 +64,7 @@ libsloxwizard_la_LIBADD = $(top_builddir)/tderesources/slox/libkcal_slox.la \
$(top_builddir)/libtdepim/libtdepim.la
sloxwizard_LDADD = libsloxwizard.la
-sloxwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+sloxwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
sloxwizard_SOURCES = sloxmain.cpp
# GroupWise
@@ -80,7 +80,7 @@ libgroupwisewizard_la_COMPILE_FIRST = $(top_builddir)/tderesources/groupwise/tde
groupwisewizard_LDADD = libgroupwisewizard.la
-groupwisewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+groupwisewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
groupwisewizard_SOURCES = groupwisemain.cpp
# Exchange
@@ -91,7 +91,7 @@ libexchangewizard_la_LIBADD = $(top_builddir)/tderesources/newexchange/libkcal_n
$(top_builddir)/libtdepim/libtdepim.la
exchangewizard_LDADD = libexchangewizard.la
-exchangewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+exchangewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
exchangewizard_SOURCES = exchangemain.cpp
# Scalix
@@ -106,7 +106,7 @@ libscalixwizard_la_SOURCES = scalixwizard.cpp kmailchanges.cpp scalixconfig.kcfg
scalixkmailchanges.cpp
scalixwizard_LDADD = libscalixwizard.la $(LIB_TDEUI)
-scalixwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+scalixwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
scalixwizard_SOURCES = scalixmain.cpp
noinst_HEADERS = egroupwarewizard.h kmailchanges.h kolabwizard.h sloxwizard.h \