LIB_QT -> LIB_TQT conversion to align to updated admin module

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

27 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/kipi-plugins/acquireimages/Makefile.am b/kipi-plugins/acquireimages/Makefile.am
index 5d724d2..0564ae4 100644
--- a/kipi-plugins/acquireimages/Makefile.am
+++ b/kipi-plugins/acquireimages/Makefile.am
@@ -8,7 +8,7 @@ kipiplugin_acquireimages_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP)
 kipiplugin_acquireimages_la_SOURCES = plugin_acquireimages.cpp acquireimagedialog.cpp screenshotdialog.cpp
 
 # Libs needed by the plugin
-kipiplugin_acquireimages_la_LIBADD = $(LIB_TIFF) $(LIB_X11) $(LIBKIPI_LIBS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+kipiplugin_acquireimages_la_LIBADD = $(LIB_TIFF) $(LIB_X11) $(LIBKIPI_LIBS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)
 
 # LD flags for the plugin
 kipiplugin_acquireimages_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
diff --git a/kipi-plugins/batchprocessimages/Makefile.am b/kipi-plugins/batchprocessimages/Makefile.am
index 92ac828..6407c63 100644
--- a/kipi-plugins/batchprocessimages/Makefile.am
+++ b/kipi-plugins/batchprocessimages/Makefile.am
@@ -21,7 +21,7 @@ kipiplugin_batchprocessimages_la_SOURCES = plugin_batchprocessimages.cpp batchpr
 					   renameimagesbase.ui renameimageswidget.cpp
 
 # Libs needed by the plugin
-kipiplugin_batchprocessimages_la_LIBADD = $(LIBKIPI_LIBS) $(LIBKEXIV2_LIBS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+kipiplugin_batchprocessimages_la_LIBADD = $(LIBKIPI_LIBS) $(LIBKEXIV2_LIBS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)
 
 # LD flags for the plugin
 kipiplugin_batchprocessimages_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
diff --git a/kipi-plugins/calendar/Makefile.am b/kipi-plugins/calendar/Makefile.am
index 574d354..73ded26 100644
--- a/kipi-plugins/calendar/Makefile.am
+++ b/kipi-plugins/calendar/Makefile.am
@@ -9,7 +9,7 @@ kipiplugin_calendar_la_SOURCES = plugin_calendar.cpp calwizard.cpp \
 		caltemplate.cpp calsettings.cpp calwidget.cpp calpainter.cpp calselect.cpp \
 		monthwidget.cpp calformatter.cpp calevents.cpp caleventsbase.ui
 
-kipiplugin_calendar_la_LIBADD = $(LIB_TDEPRINT) $(LIBKIPI_LIBS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+kipiplugin_calendar_la_LIBADD = $(LIB_TDEPRINT) $(LIBKIPI_LIBS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)
 
 kipiplugin_calendar_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins -lkcal
 
diff --git a/kipi-plugins/cdarchiving/Makefile.am b/kipi-plugins/cdarchiving/Makefile.am
index 66e3483..e795b89 100644
--- a/kipi-plugins/cdarchiving/Makefile.am
+++ b/kipi-plugins/cdarchiving/Makefile.am
@@ -11,7 +11,7 @@ kipiplugin_cdarchiving_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP)
 kipiplugin_cdarchiving_la_SOURCES = plugin_cdarchiving.cpp cdarchivingdialog.cpp cdarchiving.cpp 
 
 # Libs needed by the plugin
-kipiplugin_cdarchiving_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+kipiplugin_cdarchiving_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)
 
 # LD flags for the plugin
 kipiplugin_cdarchiving_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
diff --git a/kipi-plugins/common/libkipiplugins/Makefile.am b/kipi-plugins/common/libkipiplugins/Makefile.am
index f27551f..51ebd94 100644
--- a/kipi-plugins/common/libkipiplugins/Makefile.am
+++ b/kipi-plugins/common/libkipiplugins/Makefile.am
@@ -8,7 +8,7 @@ libkipiplugins_la_SOURCES = kpaboutdata.cpp
 
 libkipiplugins_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 0:1:0 -no-undefined
 
-libkipiplugins_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
+libkipiplugins_la_LIBADD = $(LIB_TDECORE) $(LIB_TQT)
 
 INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes) 
 
diff --git a/kipi-plugins/findimages/Makefile.am b/kipi-plugins/findimages/Makefile.am
index 72b92f1..b99daa7 100644
--- a/kipi-plugins/findimages/Makefile.am
+++ b/kipi-plugins/findimages/Makefile.am
@@ -13,7 +13,7 @@ kipiplugin_findimages_la_SOURCES = plugin_findimages.cpp displaycompare.cpp \
 				   fuzzycompare.cpp fastcompare.cpp actions.cpp
 
 # Libs needed by the plugin
-kipiplugin_findimages_la_LIBADD = -ltdefx $(LIBKIPI_LIBS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+kipiplugin_findimages_la_LIBADD = -ltdefx $(LIBKIPI_LIBS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)
 
 # LD flags for the plugin
 kipiplugin_findimages_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
diff --git a/kipi-plugins/flickrexport/Makefile.am b/kipi-plugins/flickrexport/Makefile.am
index 31d7322..7434738 100644
--- a/kipi-plugins/flickrexport/Makefile.am
+++ b/kipi-plugins/flickrexport/Makefile.am
@@ -12,7 +12,7 @@ kipiplugin_flickrexport_la_SOURCES = plugin_flickrexport.cpp imageslist.cpp \
 		                             flickrwidget.cpp mpform.cpp flickralbumdialog.ui \
 		                             flickrviewitem.cpp  
 
-kipiplugin_flickrexport_la_LIBADD = $(LIBKEXIV2_LIBS) $(LIBKDCRAW_LIBS) $(LIBKIPI_LIBS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+kipiplugin_flickrexport_la_LIBADD = $(LIBKEXIV2_LIBS) $(LIBKDCRAW_LIBS) $(LIBKIPI_LIBS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)
 
 kipiplugin_flickrexport_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
 
diff --git a/kipi-plugins/galleryexport/Makefile.am b/kipi-plugins/galleryexport/Makefile.am
index 1a9d4ab..40a69ef 100644
--- a/kipi-plugins/galleryexport/Makefile.am
+++ b/kipi-plugins/galleryexport/Makefile.am
@@ -15,7 +15,7 @@ kipiplugin_galleryexport_la_SOURCES = plugin_galleryexport.cpp \
 		galleryviewitem.cpp
 
 kipiplugin_galleryexport_la_LIBADD = $(LIBKEXIV2_LIBS) \
-	-ltdewalletclient $(LIB_TDEHTML) $(LIBKIPI_LIBS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+	-ltdewalletclient $(LIB_TDEHTML) $(LIBKIPI_LIBS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)
 
 kipiplugin_galleryexport_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
 
diff --git a/kipi-plugins/gpssync/Makefile.am b/kipi-plugins/gpssync/Makefile.am
index 5d95453..52b892e 100644
--- a/kipi-plugins/gpssync/Makefile.am
+++ b/kipi-plugins/gpssync/Makefile.am
@@ -15,7 +15,7 @@ kipiplugin_gpssync_la_SOURCES = plugin_gpssync.cpp gpssyncdialog.cpp gpslistview
 
 # Libs needed by the plugin
 kipiplugin_gpssync_la_LIBADD = $(LIBKEXIV2_LIBS) -lkipiplugins $(LIBKIPI_LIBS) $(LIB_TDEHTML) \
-	                       $(LIB_TDEPARTS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) \
+	                       $(LIB_TDEPARTS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) \
 	                       $(LIB_TDEFILE)
 
 # LD flags for the plugin
diff --git a/kipi-plugins/helloworld/Makefile.am b/kipi-plugins/helloworld/Makefile.am
index 4180bc1..aed7e13 100644
--- a/kipi-plugins/helloworld/Makefile.am
+++ b/kipi-plugins/helloworld/Makefile.am
@@ -8,7 +8,7 @@ kipiplugin_helloworld_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP)
 kipiplugin_helloworld_la_SOURCES = plugin_helloworld.cpp 
 
 # Libs needed by the plugin
-kipiplugin_helloworld_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+kipiplugin_helloworld_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)
 
 # LD flags for the plugin
 kipiplugin_helloworld_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
diff --git a/kipi-plugins/htmlexport/Makefile.am b/kipi-plugins/htmlexport/Makefile.am
index 6221e1e..c28cdb5 100644
--- a/kipi-plugins/htmlexport/Makefile.am
+++ b/kipi-plugins/htmlexport/Makefile.am
@@ -28,7 +28,7 @@ kipiplugin_htmlexport_la_SOURCES = \
 kde_kcfg_DATA = \
 	htmlexportconfig.kcfg
 
-kipiplugin_htmlexport_la_LIBADD = -lexslt -lxml2 $(LIBXSLT_LIBS) $(LIBKIPI_LIBS) $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+kipiplugin_htmlexport_la_LIBADD = -lexslt -lxml2 $(LIBXSLT_LIBS) $(LIBKIPI_LIBS) $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)
 kipiplugin_htmlexport_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
 
 
diff --git a/kipi-plugins/imageviewer/Makefile.am b/kipi-plugins/imageviewer/Makefile.am
index 020917a..a228146 100644
--- a/kipi-plugins/imageviewer/Makefile.am
+++ b/kipi-plugins/imageviewer/Makefile.am
@@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = kipiplugin_viewer.la
 
 kipiplugin_viewer_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP) $(LIBKDCRAW_LIBS_DEP)
 kipiplugin_viewer_la_SOURCES = viewerwidget.cpp texture.cpp timer.cpp plugin_viewer.cpp help.ui
-kipiplugin_viewer_la_LIBADD = $(LIBKIPI_LIBS) $(LIBKDCRAW_LIBS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) -lGL
+kipiplugin_viewer_la_LIBADD = $(LIBKIPI_LIBS) $(LIBKDCRAW_LIBS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) -lGL
 kipiplugin_viewer_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries)
 
 kde_services_DATA = kipiplugin_viewer.desktop
diff --git a/kipi-plugins/ipodexport/Makefile.am b/kipi-plugins/ipodexport/Makefile.am
index 158b375..6a41f71 100644
--- a/kipi-plugins/ipodexport/Makefile.am
+++ b/kipi-plugins/ipodexport/Makefile.am
@@ -15,7 +15,7 @@ kipiplugin_ipodexport_la_SOURCES = plugin_ipodexport.cpp \
                                    ipodlistitem.cpp \
                                    imagelist.cpp
 
-kipiplugin_ipodexport_la_LIBADD  = $(LIBKIPI_LIBS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+kipiplugin_ipodexport_la_LIBADD  = $(LIBKIPI_LIBS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)
 
 kipiplugin_ipodexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIBGPOD_LIBS) $(all_libraries)
 
diff --git a/kipi-plugins/jpeglossless/Makefile.am b/kipi-plugins/jpeglossless/Makefile.am
index 572ac3c..4f70ef2 100644
--- a/kipi-plugins/jpeglossless/Makefile.am
+++ b/kipi-plugins/jpeglossless/Makefile.am
@@ -17,7 +17,7 @@ kipiplugin_jpeglossless_la_SOURCES = plugin_jpeglossless.cpp jpegtransform.cpp \
 	                             imagerotate.cpp convert2grayscale.cpp imageflip.cpp 
 
 kipiplugin_jpeglossless_la_LIBADD = -ljpeg $(LIBKIPI_LIBS) $(LIBKEXIV2_LIBS) $(LIB_TDEUI) \
-	                            $(LIBKDCRAW_LIBS) $(LIB_TDECORE) $(LIB_QT)
+	                            $(LIBKDCRAW_LIBS) $(LIB_TDECORE) $(LIB_TQT)
 
 
 kipiplugin_jpeglossless_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
diff --git a/kipi-plugins/kameraklient/Makefile.am b/kipi-plugins/kameraklient/Makefile.am
index b01cd0d..e6ff049 100644
--- a/kipi-plugins/kameraklient/Makefile.am
+++ b/kipi-plugins/kameraklient/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = kipiplugin_kameraklient.la
 kipiplugin_kameraklient_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP)
 
-kipiplugin_kameraklient_la_LIBADD = $(LIB_GPHOTO) $(LIBKIPI_LIBS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+kipiplugin_kameraklient_la_LIBADD = $(LIB_GPHOTO) $(LIBKIPI_LIBS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)
 
 kipiplugin_kameraklient_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
 
diff --git a/kipi-plugins/metadataedit/Makefile.am b/kipi-plugins/metadataedit/Makefile.am
index c9e191f..3552eff 100644
--- a/kipi-plugins/metadataedit/Makefile.am
+++ b/kipi-plugins/metadataedit/Makefile.am
@@ -19,7 +19,7 @@ kipiplugin_metadataedit_la_SOURCES = plugin_metadataedit.cpp metadatacheckbox.cp
 
 # Libs needed by the plugin
 kipiplugin_metadataedit_la_LIBADD = $(LIBKEXIV2_LIBS) \
-	       -lkipiplugins $(LIBKIPI_LIBS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+	       -lkipiplugins $(LIBKIPI_LIBS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)
 
 # LD flags for the plugin
 kipiplugin_metadataedit_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries)
diff --git a/kipi-plugins/mpegencoder/Makefile.am b/kipi-plugins/mpegencoder/Makefile.am
index 49a3ebe..5851256 100644
--- a/kipi-plugins/mpegencoder/Makefile.am
+++ b/kipi-plugins/mpegencoder/Makefile.am
@@ -11,7 +11,7 @@ kipiplugin_mpegencoder_la_SOURCES = plugin_mpegencoder.cpp kimg2mpgbase.ui\
                                        optionsdialog.cpp checkbinprog.cpp
 
 # Libs needed by the plugin
-kipiplugin_mpegencoder_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_TDEIO) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) 
+kipiplugin_mpegencoder_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_TDEIO) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) 
 
 # LD flags for the plugin
 kipiplugin_mpegencoder_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
diff --git a/kipi-plugins/picasawebexport/Makefile.am b/kipi-plugins/picasawebexport/Makefile.am
index d9d5899..8e82264 100644
--- a/kipi-plugins/picasawebexport/Makefile.am
+++ b/kipi-plugins/picasawebexport/Makefile.am
@@ -12,7 +12,7 @@ kipiplugin_picasawebexport_la_SOURCES = plugin_picasawebexport.cpp \
 		                     picasawebwidget.cpp mpform.cpp picasawebviewitem.cpp \
 		                     PicasawebNewAlbumDialog.ui uploadwidget.ui
 
-kipiplugin_picasawebexport_la_LIBADD = $(LIBKEXIV2_LIBS) $(LIBKDCRAW_LIBS) $(LIBKIPI_LIBS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+kipiplugin_picasawebexport_la_LIBADD = $(LIBKEXIV2_LIBS) $(LIBKDCRAW_LIBS) $(LIBKIPI_LIBS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)
 
 kipiplugin_picasawebexport_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
 
diff --git a/kipi-plugins/printwizard/Makefile.am b/kipi-plugins/printwizard/Makefile.am
index e3960db..d2709d2 100644
--- a/kipi-plugins/printwizard/Makefile.am
+++ b/kipi-plugins/printwizard/Makefile.am
@@ -9,7 +9,7 @@ kipiplugin_printwizard_la_SOURCES = frmprintwizardbase.ui plugin_printwizard.cpp
 
 #LIBKIPI_LIBS = $(top_builddir)/libkipi/libkipi/libkipi.la
 kipiplugin_printwizard_la_LIBADD = $(LIBKEXIV2_LIBS) $(LIBKDCRAW_LIBS) -lkipiplugins \
-				   $(LIB_TDEPRINT) $(LIBKIPI_LIBS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+				   $(LIB_TDEPRINT) $(LIBKIPI_LIBS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)
 
 kipiplugin_printwizard_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) 
 
diff --git a/kipi-plugins/rawconverter/Makefile.am b/kipi-plugins/rawconverter/Makefile.am
index 06c4bc4..8c65b30 100644
--- a/kipi-plugins/rawconverter/Makefile.am
+++ b/kipi-plugins/rawconverter/Makefile.am
@@ -16,7 +16,7 @@ kipiplugin_rawconverter_la_SOURCES = plugin_rawconverter.cpp rawdecodingiface.cp
 
 # Libs needed by the plugin
 kipiplugin_rawconverter_la_LIBADD = -ljpeg -lpng $(LIBKEXIV2_LIBS) $(LIBKDCRAW_LIBS) $(LIBKIPI_LIBS) \
-	                            $(LIB_TIFF) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+	                            $(LIB_TIFF) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)
 
 # LD flags for the plugin
 kipiplugin_rawconverter_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
diff --git a/kipi-plugins/sendimages/Makefile.am b/kipi-plugins/sendimages/Makefile.am
index a279f9e..20b4f71 100644
--- a/kipi-plugins/sendimages/Makefile.am
+++ b/kipi-plugins/sendimages/Makefile.am
@@ -13,7 +13,7 @@ kipiplugin_sendimages_la_SOURCES = plugin_sendimages.cpp sendimagesdialog.cpp \
 
 # Libs needed by the plugin
 kipiplugin_sendimages_la_LIBADD = $(LIBKEXIV2_LIBS) $(LIBKIPI_LIBS) $(LIB_TDEIO) $(LIBKDCRAW_LIBS) \
-	                          $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+	                          $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)
 
 # LD flags for the plugin
 kipiplugin_sendimages_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) \
diff --git a/kipi-plugins/simpleviewerexport/Makefile.am b/kipi-plugins/simpleviewerexport/Makefile.am
index c79409b..88b5cc4 100644
--- a/kipi-plugins/simpleviewerexport/Makefile.am
+++ b/kipi-plugins/simpleviewerexport/Makefile.am
@@ -9,7 +9,7 @@ kipiplugin_simpleviewer_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP) $(LIBKEXIV2_LIBS_D
 kipiplugin_simpleviewer_la_SOURCES = plugin_simpleviewer.cpp svedialog.cpp \
 	                                 simpleviewerexport.cpp firstrundlg.cpp
 
-kipiplugin_simpleviewer_la_LIBADD = $(LIBKIPI_LIBS) $(LIBKDCRAW_LIBS) $(LIBKEXIV2_LIBS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+kipiplugin_simpleviewer_la_LIBADD = $(LIBKIPI_LIBS) $(LIBKDCRAW_LIBS) $(LIBKEXIV2_LIBS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)
 
 kipiplugin_simpleviewer_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
 
diff --git a/kipi-plugins/slideshow/Makefile.am b/kipi-plugins/slideshow/Makefile.am
index 75c5f53..43d0569 100644
--- a/kipi-plugins/slideshow/Makefile.am
+++ b/kipi-plugins/slideshow/Makefile.am
@@ -13,9 +13,9 @@ kipiplugin_slideshow_la_SOURCES = listimageitems.cpp plugin_slideshow.cpp \
 	slideshowloader.cpp toolbar.cpp imageloadthread.cpp kbeffect.cpp screenproperties.cpp \
 	slideshowkb.cpp
 
-#kipiplugin_slideshow_la_LIBADD = -ltdefx  $(GL_LIBS) $(LIBKIPI_LIBS) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+#kipiplugin_slideshow_la_LIBADD = -ltdefx  $(GL_LIBS) $(LIBKIPI_LIBS) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)
 kipiplugin_slideshow_la_LIBADD = -ltdefx -lXrandr $(GL_LIBS) $(LIBKIPI_LIBS) $(LIBKDCRAW_LIBS)  \
-	                         $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_QT)
+	                         $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TQT)
 
 kipiplugin_slideshow_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
 
diff --git a/kipi-plugins/sync/Makefile.am b/kipi-plugins/sync/Makefile.am
index 8cd755f..b135975 100644
--- a/kipi-plugins/sync/Makefile.am
+++ b/kipi-plugins/sync/Makefile.am
@@ -17,7 +17,7 @@ kipiplugin_sync_la_SOURCES = plugin_sync.cpp \
 		sinks/gallery/gallerycollection.cpp sinks/gallery/galleryitem.cpp
 
 kipiplugin_sync_la_LIBADD = $(LIBKEXIV2_LIBS) \
-	-ltdewalletclient $(LIB_TDEHTML) $(LIBKIPI_LIBS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+	-ltdewalletclient $(LIB_TDEHTML) $(LIBKIPI_LIBS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)
 
 kipiplugin_sync_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
 
diff --git a/kipi-plugins/timeadjust/Makefile.am b/kipi-plugins/timeadjust/Makefile.am
index 0d0d16e..b25ae4d 100644
--- a/kipi-plugins/timeadjust/Makefile.am
+++ b/kipi-plugins/timeadjust/Makefile.am
@@ -11,7 +11,7 @@ kipiplugin_timeadjust_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP) $(LIBKEXIV2_LIBS_DEP
 kipiplugin_timeadjust_la_SOURCES = plugin_timeadjust.cpp timeadjustdialog.cpp
 
 # Libs needed by the plugin
-kipiplugin_timeadjust_la_LIBADD = $(LIBKEXIV2_LIBS) $(LIBKIPI_LIBS) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+kipiplugin_timeadjust_la_LIBADD = $(LIBKEXIV2_LIBS) $(LIBKIPI_LIBS) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)
 
 # LD flags for the plugin
 kipiplugin_timeadjust_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
diff --git a/kipi-plugins/wallpaper/Makefile.am b/kipi-plugins/wallpaper/Makefile.am
index ec9c863..3bf3418 100644
--- a/kipi-plugins/wallpaper/Makefile.am
+++ b/kipi-plugins/wallpaper/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kipiplugin_wallpaper.la
 kipiplugin_wallpaper_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP)
 kipiplugin_wallpaper_la_SOURCES = plugin_wallpaper.cpp
 
-kipiplugin_wallpaper_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+kipiplugin_wallpaper_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)
 
 kipiplugin_wallpaper_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)