From 719117c106211e653acef039ba28de38260f50e9 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Mon, 17 Sep 2018 23:20:35 +0900
Subject: LIB_QT -> LIB_TQT conversion to align to updated admin module

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 acinclude.m4                       | 18 +++++++++---------
 aclocal.m4                         | 18 +++++++++---------
 apps/ktcachecheck/Makefile.am      |  2 +-
 apps/ktorrent/Makefile.am          |  2 +-
 apps/kttorinfo/Makefile.am         |  2 +-
 apps/ktupnptest/Makefile.am        |  2 +-
 libktorrent/Makefile.am            |  2 +-
 plugins/infowidget/Makefile.am     |  2 +-
 plugins/ipfilter/Makefile.am       |  2 +-
 plugins/logviewer/Makefile.am      |  2 +-
 plugins/partfileimport/Makefile.am |  2 +-
 plugins/rssfeed/Makefile.am        |  2 +-
 plugins/scanfolder/Makefile.am     |  2 +-
 plugins/scheduler/Makefile.am      |  2 +-
 plugins/search/Makefile.am         |  2 +-
 plugins/stats/Makefile.am          |  2 +-
 plugins/upnp/Makefile.am           |  2 +-
 plugins/webinterface/Makefile.am   |  2 +-
 plugins/zeroconf/Makefile.am       |  2 +-
 utests/Makefile.am                 |  2 +-
 20 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index aa314d0..8fca7a0 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1601,19 +1601,19 @@ AC_PATH_QT_MOC_UIC
 KDE_CHECK_QT_JPEG
 
 if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
+LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
 else
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
+LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
 fi
-test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS"
+test -z "$KDE_MT_LIBS" || LIB_TQT="$LIB_TQT $KDE_MT_LIBS"
 for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
   if test -e "$a"; then
-     LIB_QT="$LIB_QT ${kde_int_qt}_incremental"
+     LIB_TQT="$LIB_TQT ${kde_int_qt}_incremental"
      break
   fi
 done
 
-AC_SUBST(LIB_QT)
+AC_SUBST(LIB_TQT)
 AC_SUBST(LIB_QPE)
 
 AC_SUBST(kde_qtver)
@@ -2125,7 +2125,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
 else
-   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
+   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_TQT)")
    AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
    AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
@@ -5470,8 +5470,8 @@ AC_DEFUN([AC_PATH_QTOPIA],
 
   AC_MSG_CHECKING([for Qtopia])
 
-  LIB_QTOPIA="-lqpe"
-  AC_SUBST(LIB_QTOPIA)
+  LIB_TQTOPIA="-lqpe"
+  AC_SUBST(LIB_TQTOPIA)
 
   kde_qtopia_dirs="$QPEDIR /opt/Qtopia"
 
@@ -5518,7 +5518,7 @@ is required.])
 
   CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes"
   LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
-  LIBS="$LIBS $LIB_QTOPIA $LIBQT"
+  LIBS="$LIBS $LIB_TQTOPIA $LIBQT"
 
   cat > conftest.$ac_ext <<EOF
 #include "confdefs.h"
diff --git a/aclocal.m4 b/aclocal.m4
index 4054f54..ac01141 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1613,19 +1613,19 @@ AC_PATH_QT_MOC_UIC
 KDE_CHECK_QT_JPEG
 
 if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
+LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
 else
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
+LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
 fi
-test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS"
+test -z "$KDE_MT_LIBS" || LIB_TQT="$LIB_TQT $KDE_MT_LIBS"
 for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
   if test -e "$a"; then
-     LIB_QT="$LIB_QT ${kde_int_qt}_incremental"
+     LIB_TQT="$LIB_TQT ${kde_int_qt}_incremental"
      break
   fi
 done
 
-AC_SUBST(LIB_QT)
+AC_SUBST(LIB_TQT)
 AC_SUBST(LIB_QPE)
 
 AC_SUBST(kde_qtver)
@@ -2137,7 +2137,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
 else
-   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
+   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_TQT)")
    AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
    AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
@@ -5482,8 +5482,8 @@ AC_DEFUN([AC_PATH_QTOPIA],
 
   AC_MSG_CHECKING([for Qtopia])
 
-  LIB_QTOPIA="-lqpe"
-  AC_SUBST(LIB_QTOPIA)
+  LIB_TQTOPIA="-lqpe"
+  AC_SUBST(LIB_TQTOPIA)
 
   kde_qtopia_dirs="$QPEDIR /opt/Qtopia"
 
@@ -5530,7 +5530,7 @@ is required.])
 
   CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes"
   LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
-  LIBS="$LIBS $LIB_QTOPIA $LIBQT"
+  LIBS="$LIBS $LIB_TQTOPIA $LIBQT"
 
   cat > conftest.$ac_ext <<EOF
 #include "confdefs.h"
diff --git a/apps/ktcachecheck/Makefile.am b/apps/ktcachecheck/Makefile.am
index 4c57066..a9f5d3e 100644
--- a/apps/ktcachecheck/Makefile.am
+++ b/apps/ktcachecheck/Makefile.am
@@ -5,7 +5,7 @@ bin_PROGRAMS = ktcachecheck
 
 ktcachecheck_SOURCES = cachecheck.cpp cachechecker.cpp singlecachechecker.cpp \
 	multicachechecker.cpp
-ktcachecheck_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+ktcachecheck_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 ktcachecheck_LDADD = $(LIB_TDEPARTS) ../../libktorrent/libktorrent.la \
 	$(LIB_TDEFILE) $(LIB_TDEIO)
 noinst_HEADERS = cachechecker.h singlecachechecker.h multicachechecker.h
diff --git a/apps/ktorrent/Makefile.am b/apps/ktorrent/Makefile.am
index 3f226d1..6a6d309 100644
--- a/apps/ktorrent/Makefile.am
+++ b/apps/ktorrent/Makefile.am
@@ -11,7 +11,7 @@ INCLUDES = -I$(top_builddir)/ktorrent/libktorrent -I$(top_builddir)/libktorrent/
 	$(all_includes)
 
 # the library search path. 
-ktorrent_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+ktorrent_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 # the libraries to link against.
 ktorrent_LDADD = ../../apps/ktorrent/newui/libnewui.la $(LIB_TDEFILE) \
diff --git a/apps/kttorinfo/Makefile.am b/apps/kttorinfo/Makefile.am
index 345ea14..0736208 100644
--- a/apps/kttorinfo/Makefile.am
+++ b/apps/kttorinfo/Makefile.am
@@ -3,7 +3,7 @@ METASOURCES = AUTO
 
 bin_PROGRAMS = kttorinfo
 kttorinfo_SOURCES = main.cpp
-kttorinfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kttorinfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kttorinfo_LDADD = ../../libktorrent/libktorrent.la $(LIB_TDEPARTS) $(LIB_TDEFILE) \
 	$(LIB_TDEIO)
 
diff --git a/apps/ktupnptest/Makefile.am b/apps/ktupnptest/Makefile.am
index 0d98c3b..9920c54 100644
--- a/apps/ktupnptest/Makefile.am
+++ b/apps/ktupnptest/Makefile.am
@@ -5,6 +5,6 @@ bin_PROGRAMS = ktupnptest
 ktupnptest_SOURCES = main.cpp upnptestapp.cpp mainwidget.ui
 ktupnptest_LDADD = ../../plugins/upnp/libktupnp.la \
 	../../libktorrent/libktorrent.la $(LIB_TDEIO)
-ktupnptest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+ktupnptest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 noinst_HEADERS = upnptestapp.h
 KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI)
diff --git a/libktorrent/Makefile.am b/libktorrent/Makefile.am
index b6c27c4..d5537c5 100644
--- a/libktorrent/Makefile.am
+++ b/libktorrent/Makefile.am
@@ -18,5 +18,5 @@ libktorrent_la_SOURCES = expandablewidget.cpp functions.cpp labelview.cpp \
 libktorrent_la_LIBADD = ../libktorrent/net/libnet.la \
 	../libktorrent/datachecker/libdatachecker.la ../libktorrent/mse/libmse.la ../libktorrent/migrate/libmigrate.la \
 	../libktorrent/util/libutil.la ../libktorrent/torrent/libtorrent.la \
-	../libktorrent/kademlia/libkademlia.la ../libktorrent/interfaces/libinterfaces.la $(LIB_TDEPARTS) $(LIB_TDEIO) $(LIB_TDECORE) $(LIB_QT) $(LIB_TDEUI)
+	../libktorrent/kademlia/libkademlia.la ../libktorrent/interfaces/libinterfaces.la $(LIB_TDEPARTS) $(LIB_TDEIO) $(LIB_TDECORE) $(LIB_TQT) $(LIB_TDEUI)
 KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI)
diff --git a/plugins/infowidget/Makefile.am b/plugins/infowidget/Makefile.am
index 1937ee5..5efb8c4 100644
--- a/plugins/infowidget/Makefile.am
+++ b/plugins/infowidget/Makefile.am
@@ -11,7 +11,7 @@ ktinfowidgetplugin_la_SOURCES = infowidgetplugin.cpp availabilitychunkbar.cpp \
 
 # Libs needed by the plugin
 ktinfowidgetplugin_la_LIBADD = ../../libktorrent/libktorrent.la \
-			   $(LIB_TDEHTML) $(LIB_TDEPARTS) $(LIB_QT) \
+			   $(LIB_TDEHTML) $(LIB_TDEPARTS) $(LIB_TQT) \
 			   $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)
 
 
diff --git a/plugins/ipfilter/Makefile.am b/plugins/ipfilter/Makefile.am
index 858294a..c2395b0 100644
--- a/plugins/ipfilter/Makefile.am
+++ b/plugins/ipfilter/Makefile.am
@@ -9,7 +9,7 @@ ktipfilterplugin_la_SOURCES = ipfilterplugin.cpp ipblockingpref.ui \
 
 # Libs needed by the plugin
 ktipfilterplugin_la_LIBADD = $(LIB_TDEHTML) $(LIB_TDEPARTS) \
-	../../libktorrent/libktorrent.la $(LIB_QT) \
+	../../libktorrent/libktorrent.la $(LIB_TQT) \
 	$(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)
 
 
diff --git a/plugins/logviewer/Makefile.am b/plugins/logviewer/Makefile.am
index 88b1fe8..e11e126 100644
--- a/plugins/logviewer/Makefile.am
+++ b/plugins/logviewer/Makefile.am
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = ktlogviewerplugin.la
 
 # Libs needed by the plugin
 ktlogviewerplugin_la_LIBADD = $(LIB_TDEHTML) $(LIB_TDEPARTS) \
-	../../libktorrent/libktorrent.la $(LIB_QT) \
+	../../libktorrent/libktorrent.la $(LIB_TQT) \
 	$(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)
 
 
diff --git a/plugins/partfileimport/Makefile.am b/plugins/partfileimport/Makefile.am
index f1d7fa3..263f8a0 100644
--- a/plugins/partfileimport/Makefile.am
+++ b/plugins/partfileimport/Makefile.am
@@ -8,7 +8,7 @@ ktpartfileimportplugin_la_SOURCES = partfileimportplugin.cpp importdlgbase.ui im
 # Libs needed by the plugin
 ktpartfileimportplugin_la_LIBADD = $(LIB_TDEHTML) $(LIB_TDEPARTS) \
 	../../libktorrent/libktorrent.la \
-	$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)
+	$(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)
 
 # LD flags for the plugin
 # -module says: this is a module, i.e. something you're going to dlopen
diff --git a/plugins/rssfeed/Makefile.am b/plugins/rssfeed/Makefile.am
index 0547cbc..e5fa2ed 100644
--- a/plugins/rssfeed/Makefile.am
+++ b/plugins/rssfeed/Makefile.am
@@ -23,7 +23,7 @@ noinst_HEADERS = rssfeedplugin.h rssfeedmanager.h rssfeed.h rssfilter.h \
 		rssarticle.h rsslinkdownloader.h
 ktrssfeedplugin_la_SOURCES = rssfeedplugin.cpp rssfeedmanager.cpp \
 			rssfeedwidget.ui rssfeed.cpp rssfilter.cpp rssarticle.cpp rsslinkdownloader.cpp
-ktrssfeedplugin_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) rss/librsslocal.la \
+ktrssfeedplugin_la_LIBADD = $(LIB_TDEIO) $(LIB_TQT) rss/librsslocal.la \
 	../../libktorrent/libktorrent.la $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_TDEPARTS)
 
 SUBDIRS = rss
diff --git a/plugins/scanfolder/Makefile.am b/plugins/scanfolder/Makefile.am
index 05ae0c8..49ba5a7 100644
--- a/plugins/scanfolder/Makefile.am
+++ b/plugins/scanfolder/Makefile.am
@@ -25,7 +25,7 @@ ktscanfolderplugin_la_SOURCES = scanfolderplugin.cpp \
 	scanfolderpluginsettings.kcfgc scanfolderprefpage.cpp sfprefwidgetbase.ui scanfolderprefpagewidget.cpp \
 	scanfolder.cpp
 ktscanfolderplugin_la_LIBADD = $(LIB_TDEPARTS) ../../libktorrent/libktorrent.la \
-		       $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)
+		       $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)
 
 
 KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI)
diff --git a/plugins/scheduler/Makefile.am b/plugins/scheduler/Makefile.am
index 17f7965..5b388eb 100644
--- a/plugins/scheduler/Makefile.am
+++ b/plugins/scheduler/Makefile.am
@@ -10,7 +10,7 @@ ktschedulerplugin_la_SOURCES = schedulerplugin.cpp \
 # Libs needed by the plugin
 ktschedulerplugin_la_LIBADD = $(LIB_TDEHTML) $(LIB_TDEPARTS) \
 	../../libktorrent/libktorrent.la \
-	$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)
+	$(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)
 
 # LD flags for the plugin
 # -module says: this is a module, i.e. something you're going to dlopen
diff --git a/plugins/search/Makefile.am b/plugins/search/Makefile.am
index ebc85aa..9e5b312 100644
--- a/plugins/search/Makefile.am
+++ b/plugins/search/Makefile.am
@@ -8,7 +8,7 @@ ktsearchplugin_la_SOURCES = searchplugin.cpp htmlpart.cpp searchbar.ui \
 
 # Libs needed by the plugin
 ktsearchplugin_la_LIBADD = ../../libktorrent/libktorrent.la \
-			   $(LIB_TDEHTML) $(LIB_TDEPARTS) $(LIB_QT) \
+			   $(LIB_TDEHTML) $(LIB_TDEPARTS) $(LIB_TQT) \
 			   $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)
 
 # LD flags for the plugin
diff --git a/plugins/stats/Makefile.am b/plugins/stats/Makefile.am
index 26c69b7..a92ab0d 100644
--- a/plugins/stats/Makefile.am
+++ b/plugins/stats/Makefile.am
@@ -9,7 +9,7 @@ ktstatsplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) $(L
 ktstatsplugin_la_SOURCES = ChartDrawerData.cc ChartDrawer.cc statsspdwgt.ui statsconwgt.ui StatsSpd.cc StatsCon.cc sprefwgt.ui statspluginsettings.kcfgc \
 		 StatsPluginPrefsPage.cc StatsPluginPrefs.cc statsplugin.cc
 
-ktstatsplugin_la_LIBADD = $(LIB_QT) ../../libktorrent/libktorrent.la
+ktstatsplugin_la_LIBADD = $(LIB_TQT) ../../libktorrent/libktorrent.la
 
 noinst_HEADERS = ChartDrawerData.h ChartDrawer.h StatsSpd.h StatsCon.h StatsPluginPrefsPage.h StatsPluginPrefs.h statsplugin.h 
 
diff --git a/plugins/upnp/Makefile.am b/plugins/upnp/Makefile.am
index 8b85973..467ebc4 100644
--- a/plugins/upnp/Makefile.am
+++ b/plugins/upnp/Makefile.am
@@ -15,7 +15,7 @@ ktupnpplugin_la_SOURCES = upnpplugin.cpp upnpprefpage.cpp upnpwidget.ui \
 # Libs needed by the plugin
 ktupnpplugin_la_LIBADD = libktupnp.la \
 	$(LIB_TDEPARTS) ../../libktorrent/libktorrent.la \
-	$(LIB_QT) \
+	$(LIB_TQT) \
 	$(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)
 
 
diff --git a/plugins/webinterface/Makefile.am b/plugins/webinterface/Makefile.am
index 09a0f10..1c2bf39 100644
--- a/plugins/webinterface/Makefile.am
+++ b/plugins/webinterface/Makefile.am
@@ -11,7 +11,7 @@ ktwebinterfaceplugin_la_SOURCES = webinterfaceplugin.cpp httpserver.cpp \
 		httpclienthandler.cpp httpresponseheader.cpp
 # Libs needed by the plugin
 ktwebinterfaceplugin_la_LIBADD = ../../libktorrent/libktorrent.la \
-			   $(LIB_TDEHTML) $(LIB_TDEPARTS) $(LIB_QT) \
+			   $(LIB_TDEHTML) $(LIB_TDEPARTS) $(LIB_TQT) \
 			   $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)
 
 # LD flags for the plugin
diff --git a/plugins/zeroconf/Makefile.am b/plugins/zeroconf/Makefile.am
index fb482f0..ba959bc 100644
--- a/plugins/zeroconf/Makefile.am
+++ b/plugins/zeroconf/Makefile.am
@@ -12,7 +12,7 @@ ktzeroconfplugin_la_SOURCES = localbrowser.cpp avahiservice.cpp \
 	zeroconfplugin.cpp
 
 ktzeroconfplugin_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_TDEUI)\
-	$(LIB_QT) ../../libktorrent/libktorrent.la
+	$(LIB_TQT) ../../libktorrent/libktorrent.la
 
 noinst_HEADERS = zeroconfplugin.h
 
diff --git a/utests/Makefile.am b/utests/Makefile.am
index 7059020..78de5ad 100644
--- a/utests/Makefile.am
+++ b/utests/Makefile.am
@@ -3,7 +3,7 @@ METASOURCES = AUTO
 noinst_HEADERS = unittest.h testrunner.h upnpparsedescriptiontest.h \
 					upnpparseresponsetest.h dhtmsgparsetest.h biginttest.h rc4test.h difflehellmantest.h
 bin_PROGRAMS = ktutester
-ktutester_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+ktutester_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 ktutester_SOURCES = unittest.cpp testrunner.cpp main.cpp \
 					upnpparsedescriptiontest.cpp upnpparseresponsetest.cpp dhtmsgparsetest.cpp biginttest.cpp \
 		rc4test.cpp difflehellmantest.cpp
-- 
cgit v1.2.1