diff --git a/acinclude.m4 b/acinclude.m4
index 7cf7f64..4e86c3a 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1577,19 +1577,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)
@@ -2101,7 +2101,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)")
@@ -5444,8 +5444,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"
 
@@ -5492,7 +5492,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/ksquirrel.kdevprj b/ksquirrel.kdevprj
index 748f21b..d4fb4fd 100644
--- a/ksquirrel.kdevprj
+++ b/ksquirrel.kdevprj
@@ -22,7 +22,7 @@ bin_program=ksquirrel
 cflags=
 cppflags=
 cxxflags=\s-O2 -Wall
-ldadd=$(KDE_LDFLAGS) $(QT_LDFLAGS) $(LIB_TDEPRINT) $(LIB_TDEUTILS) $(LIB_TDEIO) $(ksquirrellibs_LIBS) -lkonq -lqui $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+ldadd=$(KDE_LDFLAGS) $(QT_LDFLAGS) $(LIB_TDEPRINT) $(LIB_TDEUTILS) $(LIB_TDEIO) $(ksquirrellibs_LIBS) -lkonq -lqui $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)
 ldflags=\s-s                                                            \s
 
 [General]
diff --git a/ksquirrel/Makefile.am b/ksquirrel/Makefile.am
index 82d77b8..cd2f2ed 100644
--- a/ksquirrel/Makefile.am
+++ b/ksquirrel/Makefile.am
@@ -4,7 +4,7 @@ bin_PROGRAMS = ksquirrel
 ## INCLUDES were found outside tdevelop specific part
 
 ksquirrel_SOURCES = sq_slideshowwidget.cpp sq_slideshow.ui sq_slideshowlisting.ui fmt_filters.cpp sq_glwidget_stuff.cpp sq_tabopendialog.ui sq_dragprovider.cpp sq_utils_scale.cpp sq_utils.cpp sq_thumbnailsunused.cpp sq_dirthumbs.cpp sq_downloader.cpp sq_glselectionpainter.cpp sq_glwidget.cpp sq_glparts.cpp sq_codecsettings.cpp sq_filedialog.cpp sq_codecsettingsskeleton.ui sq_kipimanager.cpp sq_kipiinterface.cpp sq_progressbox.cpp sq_thumbnailloadjob.cpp sq_splashscreen.cpp sq_popupmenu.cpp sq_glinfo.ui sq_glwidget_helpers.cpp sq_imageloader.cpp sq_pluginsinfo.ui sq_iconloader.cpp sq_selectdeselectgroup.ui sq_thumbnailcachemaster.ui sq_errorstring.cpp sq_navigatordropmenu.cpp sq_fileiconviewbase.cpp sq_helpwidget.ui sq_glview.cpp sq_viewcache.ui sq_filethumbviewitem.cpp sq_progress.cpp sq_thumbnailsize.cpp sq_pixmapcache.cpp sq_filethumbview.cpp sq_dir.cpp sq_iconlistbox.cpp sq_iconlistitem.cpp sq_widgetstack.cpp sq_options.ui sq_libraryhandler.cpp sq_imageproperties.ui sq_hloptions.cpp sq_glu.cpp sq_filters.ui sq_fileiconview.cpp sq_filedetailview.cpp sq_externaltools.ui sq_externaltool.cpp sq_diroperator.cpp sq_config.cpp sq_bookmarkowner.cpp sq_archivehandler.cpp ksquirrel.cpp main.cpp 
-ksquirrel_LDADD   = ./sidebar/libsidebar.a ./imageedit/libimageedit.a $(KDE_LDFLAGS) $(QT_LDFLAGS) $(LIB_TDEPRINT) $(LIB_TDEUTILS) $(LIB_TDEIO) $(ksquirrellibs_LIBS) -lkonq $(LIB_QUI) $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIBSOCKET) -lDCOP -ltdefx
+ksquirrel_LDADD   = ./sidebar/libsidebar.a ./imageedit/libimageedit.a $(KDE_LDFLAGS) $(QT_LDFLAGS) $(LIB_TDEPRINT) $(LIB_TDEUTILS) $(LIB_TDEIO) $(ksquirrellibs_LIBS) -lkonq $(LIB_QUI) $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) $(LIBSOCKET) -lDCOP -ltdefx
 
 SUBDIRS = sidebar imageedit mime 
 
diff --git a/ksquirrel/ksquirrel-libs-configurator/Makefile.am b/ksquirrel/ksquirrel-libs-configurator/Makefile.am
index 1c331fa..1b926d3 100644
--- a/ksquirrel/ksquirrel-libs-configurator/Makefile.am
+++ b/ksquirrel/ksquirrel-libs-configurator/Makefile.am
@@ -4,8 +4,8 @@ bin_PROGRAMS = ksquirrel-libs-configurator-real
 bin_SCRIPTS  = ksquirrel-libs-configurator
 
 ksquirrel_libs_configurator_real_SOURCES = main.cpp klc.ui
-ksquirrel_libs_configurator_real_LDADD   = $(KDE_LDFLAGS) $(QT_LDFLAGS) $(LIB_TDEIO) $(LIB_TDEUI) -lDCOP $(LIB_TDECORE) $(LIB_QT)
-ksquirrel_libs_configurator_real_LDFLAGS = $(KDE_LDFLAGS) $(QT_LDFLAGS) $(LIB_TDEIO) $(LIB_TDEUI) -lDCOP $(LIB_TDECORE) $(LIB_QT)
+ksquirrel_libs_configurator_real_LDADD   = $(KDE_LDFLAGS) $(QT_LDFLAGS) $(LIB_TDEIO) $(LIB_TDEUI) -lDCOP $(LIB_TDECORE) $(LIB_TQT)
+ksquirrel_libs_configurator_real_LDFLAGS = $(KDE_LDFLAGS) $(QT_LDFLAGS) $(LIB_TDEIO) $(LIB_TDEUI) -lDCOP $(LIB_TDECORE) $(LIB_TQT)
 
 AM_CXXFLAGS = $(ksquirrellibs_CFLAGS)
 
diff --git a/ksquirrel/ksquirrelpart/Makefile.am b/ksquirrel/ksquirrelpart/Makefile.am
index a411947..2e50ce8 100644
--- a/ksquirrel/ksquirrelpart/Makefile.am
+++ b/ksquirrel/ksquirrelpart/Makefile.am
@@ -14,7 +14,7 @@ AM_CCASFLAGS = -I$(srcdir) $(KSQUIRREL_ASM_DEFS)
 
 libksquirrelpart_la_SOURCES = ksquirrelpart.cpp sq_glparts.cpp sq_glu.cpp sq_glwidget.cpp sq_glwidget_stuff.cpp sq_libraryhandler.cpp sq_downloader.cpp sq_iconloader.cpp fmt_filters.cpp sq_externaltool.cpp sq_config.cpp sq_filedialog.cpp sq_imagefilter.ui sq_imagebcg.ui sq_glselectionpainter.cpp sq_glwidget_helpers.cpp sq_label.cpp sq_bcglabel.cpp sq_popupmenu.cpp sq_codecsettingsskeleton.ui sq_codecsettings.cpp sq_imageproperties.ui sq_utils.cpp sq_helpwidget.ui sq_utils_asm_scale.S sq_utils_scale.cpp sq_diroperator.cpp sq_glview.cpp sq_errorstring.cpp
 libksquirrelpart_la_LIBADD = $(LIB_TDEPARTS)
-libksquirrelpart_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEFX) $(KDE_PLUGIN) $(ksquirrellibs_LIBS) $(LIB_TDEPRINT) -lkonq -ltdefx $(LIB_QUI)
+libksquirrelpart_la_LDFLAGS = $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEFX) $(KDE_PLUGIN) $(ksquirrellibs_LIBS) $(LIB_TDEPRINT) -lkonq -ltdefx $(LIB_QUI)
 
 if SQ_HAVE_KEXIF
 libksquirrelpart_la_LDFLAGS += $(libkexif_LIBS)