LIB_QT -> LIB_TQT conversion to align to updated admin module

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
6 years ago · 08647add49
parent 969ddaf1a0
commit 08647add49
203 changed files with 265 additions and 265 deletions
--- a/chalk/Makefile.am
+++ b/chalk/Makefile.am
@ -3,13 +3,13 @@ INCLUDES  = $(KOFFICE_INCLUDES) $(KOPAINTER_INCLUDES) $(all_includes)
 ## The common lib, shared between the part, the plugins, and the filters
 lib_LTLIBRARIES = libchalkcommon.la
 libchalkcommon_la_SOURCES = dummy.cc
-libchalkcommon_la_LDFLAGS = $(all_libraries) $(LIB_QT) -version-info 1:0 -no-undefined
+libchalkcommon_la_LDFLAGS = $(all_libraries) $(LIB_TQT) -version-info 1:0 -no-undefined
 libchalkcommon_la_LIBADD = sdk/libchalksdk.la core/libchalkimage.la ui/libchalkui.la chalkcolor/libchalkcolor.la $(LCMS_LIBS) $(LIB_KOFFICEUI) $(LIB_KOPAINTER) $(LIB_KOPALETTE) $(LIB_XINPUTEXT)

 ## The part
 kde_module_LTLIBRARIES = libchalkpart.la
 libchalkpart_la_SOURCES = chalk_part_init.cc
-libchalkpart_la_LDFLAGS = $(all_libraries) $(LIB_QT) -module $(KDE_PLUGIN)
+libchalkpart_la_LDFLAGS = $(all_libraries) $(LIB_TQT) -module $(KDE_PLUGIN)
 libchalkpart_la_LIBADD = $(KOFFICE_LIBS) libchalkcommon.la ../chalk/ui/libchalkui.la

 METASOURCES = AUTO
@ -18,7 +18,7 @@ METASOURCES = AUTO
 tdeinit_LTLIBRARIES = chalk.la
 bin_PROGRAMS =
 chalk_la_SOURCES = main.cc
-chalk_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT)
+chalk_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT)
 chalk_la_LIBADD = $(LIB_KOFFICECORE)

 xdg_apps_DATA = chalk.desktop
--- a/chalk/chalkcolor/Makefile.am
+++ b/chalk/chalkcolor/Makefile.am
@ -19,7 +19,7 @@ libchalkcolor_la_SOURCES = kis_color.cc kis_colorspace.cc \
 	kis_u16_base_colorspace.cc kis_f32_base_colorspace.cc $(OPENEXR_SOURCES)

 libchalkcolor_la_LDFLAGS = -version-info 1:0:0 -no-undefined $(all_libraries)
-libchalkcolor_la_LIBADD  = colorspaces/libchalkcolorspaces.la $(LCMS_LIBS) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_QT) $(OPENEXR_LIBS)
+libchalkcolor_la_LIBADD  = colorspaces/libchalkcolorspaces.la $(LCMS_LIBS) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TQT) $(OPENEXR_LIBS)

 include_HEADERS =  \
    kis_channelinfo.h \
--- a/chalk/colorspaces/cmyk_u16/Makefile.am
+++ b/chalk/colorspaces/cmyk_u16/Makefile.am
@ -18,7 +18,7 @@ kde_module_LTLIBRARIES = chalk_cmyk_u16_plugin.la
 chalk_cmyk_u16_plugin_la_SOURCES = cmyk_u16_plugin.cc
 noinst_HEADERS = cmyk_u16_plugin.h kis_cmyk_u16_colorspace.h

-chalk_cmyk_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
+chalk_cmyk_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
 chalk_cmyk_u16_plugin_la_LIBADD = libchalk_cmyk_u16.la ../../chalkcolor/libchalkcolor.la

 chalk_cmyk_u16_plugin_la_METASOURCES = AUTO
--- a/chalk/colorspaces/cmyk_u8/Makefile.am
+++ b/chalk/colorspaces/cmyk_u8/Makefile.am
@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = chalkcmykplugin.la
 chalkcmykplugin_la_SOURCES = cmyk_plugin.cc kis_cmyk_colorspace.cc
 noinst_HEADERS = cmyk_plugin.h kis_cmyk_colorspace.h 

-chalkcmykplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
+chalkcmykplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
 chalkcmykplugin_la_LIBADD =  ../../chalkcolor/libchalkcolor.la

 chalkcmykplugin_la_METASOURCES = AUTO
--- a/chalk/colorspaces/gray_u16/Makefile.am
+++ b/chalk/colorspaces/gray_u16/Makefile.am
@ -19,7 +19,7 @@ kde_module_LTLIBRARIES = chalk_gray_u16_plugin.la
 chalk_gray_u16_plugin_la_SOURCES = gray_u16_plugin.cc
 noinst_HEADERS = gray_u16_plugin.h kis_gray_u16_colorspace.h

-chalk_gray_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
+chalk_gray_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
 chalk_gray_u16_plugin_la_LIBADD =  libchalk_gray_u16.la ../../chalkcolor/libchalkcolor.la

 chalk_gray_u16_plugin_la_METASOURCES = AUTO
--- a/chalk/colorspaces/gray_u8/Makefile.am
+++ b/chalk/colorspaces/gray_u8/Makefile.am
@ -18,7 +18,7 @@ kde_module_LTLIBRARIES = chalkgrayplugin.la
 chalkgrayplugin_la_SOURCES = gray_plugin.cc
 noinst_HEADERS = gray_plugin.h kis_gray_colorspace.h

-chalkgrayplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
+chalkgrayplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
 chalkgrayplugin_la_LIBADD =  libchalkgrayscale.la ../../chalkcolor/libchalkcolor.la

 chalkgrayplugin_la_METASOURCES = AUTO
--- a/chalk/colorspaces/lms_f32/Makefile.am
+++ b/chalk/colorspaces/lms_f32/Makefile.am
@ -21,7 +21,7 @@ kde_module_LTLIBRARIES = chalk_lms_f32_plugin.la
 chalk_lms_f32_plugin_la_SOURCES = lms_f32_plugin.cc
 noinst_HEADERS = lms_f32_plugin.h kis_lms_f32_colorspace.h

-chalk_lms_f32_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
+chalk_lms_f32_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
 chalk_lms_f32_plugin_la_LIBADD =  libchalk_lms_f32.la ../../chalkcolor/libchalkcolor.la

 chalk_lms_f32_plugin_la_METASOURCES = AUTO
--- a/chalk/colorspaces/rgb_f16half/Makefile.am
+++ b/chalk/colorspaces/rgb_f16half/Makefile.am
@ -22,7 +22,7 @@ kde_module_LTLIBRARIES = chalk_rgb_f16half_plugin.la
 chalk_rgb_f16half_plugin_la_SOURCES = rgb_f16half_plugin.cc
 noinst_HEADERS = rgb_f16half_plugin.h kis_rgb_f16half_colorspace.h

-chalk_rgb_f16half_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
+chalk_rgb_f16half_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
 chalk_rgb_f16half_plugin_la_LIBADD = libchalk_rgb_f16half.la ../../chalkcolor/libchalkcolor.la

 chalk_rgb_f16half_plugin_la_METASOURCES = AUTO
--- a/chalk/colorspaces/rgb_f32/Makefile.am
+++ b/chalk/colorspaces/rgb_f32/Makefile.am
@ -21,7 +21,7 @@ kde_module_LTLIBRARIES = chalk_rgb_f32_plugin.la
 chalk_rgb_f32_plugin_la_SOURCES = rgb_f32_plugin.cc
 noinst_HEADERS = rgb_f32_plugin.h kis_rgb_f32_colorspace.h

-chalk_rgb_f32_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
+chalk_rgb_f32_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
 chalk_rgb_f32_plugin_la_LIBADD =  libchalk_rgb_f32.la ../../chalkcolor/libchalkcolor.la

 chalk_rgb_f32_plugin_la_METASOURCES = AUTO
--- a/chalk/colorspaces/rgb_u16/Makefile.am
+++ b/chalk/colorspaces/rgb_u16/Makefile.am
@ -19,7 +19,7 @@ kde_module_LTLIBRARIES = chalk_rgb_u16_plugin.la
 chalk_rgb_u16_plugin_la_SOURCES = rgb_u16_plugin.cc
 noinst_HEADERS = rgb_u16_plugin.h kis_rgb_u16_colorspace.h

-chalk_rgb_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
+chalk_rgb_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
 chalk_rgb_u16_plugin_la_LIBADD = libchalk_rgb_u16.la ../../chalkcolor/libchalkcolor.la

 chalk_rgb_u16_plugin_la_METASOURCES = AUTO
--- a/chalk/colorspaces/rgb_u8/Makefile.am
+++ b/chalk/colorspaces/rgb_u8/Makefile.am
@ -9,7 +9,7 @@ INCLUDES  =  -I$(srcdir)/../../sdk \

 lib_LTLIBRARIES = libchalkrgb.la
 libchalkrgb_la_SOURCES = kis_rgb_colorspace.cc
-libchalkrgb_la_LDFLAGS = $(all_libraries) $(LIB_QT)
+libchalkrgb_la_LDFLAGS = $(all_libraries) $(LIB_TQT)
 libchalkrgb_la_LIBADD =  ../../chalkcolor/libchalkcolor.la

 # Install this plugin in the KDE modules directory
@ -19,7 +19,7 @@ kde_module_LTLIBRARIES = chalkrgbplugin.la
 chalkrgbplugin_la_SOURCES = rgb_plugin.cc
 noinst_HEADERS = rgb_plugin.h kis_rgb_colorspace.h

-chalkrgbplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
+chalkrgbplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
 chalkrgbplugin_la_LIBADD =  libchalkrgb.la ../../chalkcolor/libchalkcolor.la

 chalkrgbplugin_la_METASOURCES = AUTO
--- a/chalk/colorspaces/wet/Makefile.am
+++ b/chalk/colorspaces/wet/Makefile.am
@ -20,7 +20,7 @@ kde_module_LTLIBRARIES = chalkwetplugin.la
 chalkwetplugin_la_SOURCES = kis_wet_colorspace.cc wet_plugin.cc kis_wetop.cc kis_wet_palette_widget.cc kis_wetness_visualisation_filter.cc kis_texture_painter.cc kis_texture_filter.cc wetphysicsfilter.cc wdgpressure.ui
 noinst_HEADERS = kis_wet_colorspace.h wet_plugin.h wetphysicsfilter.h kis_wetop.cc kis_wet_palette_widget.h kis_texture_painter.h kis_wetness_visualisation_filter.h kis_texture_filter.h wetphysicsfilter.h

-chalkwetplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
+chalkwetplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
 chalkwetplugin_la_LIBADD =  ../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE) \
 	../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../chalk/core/libchalkimage.la \
--- a/chalk/colorspaces/ycbcr_u16/Makefile.am
+++ b/chalk/colorspaces/ycbcr_u16/Makefile.am
@ -19,7 +19,7 @@ kde_module_LTLIBRARIES = chalk_ycbcr_u16_plugin.la
 chalk_ycbcr_u16_plugin_la_SOURCES = ycbcr_u16_plugin.cc
 noinst_HEADERS = ycbcr_u16_plugin.h kis_ycbcr_u16_colorspace.h

-chalk_ycbcr_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
+chalk_ycbcr_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
 chalk_ycbcr_u16_plugin_la_LIBADD =  libchalk_ycbcr_u16.la ../../chalkcolor/libchalkcolor.la

 METASOURCES = AUTO
--- a/chalk/colorspaces/ycbcr_u8/Makefile.am
+++ b/chalk/colorspaces/ycbcr_u8/Makefile.am
@ -19,7 +19,7 @@ kde_module_LTLIBRARIES = chalk_ycbcr_u8_plugin.la
 chalk_ycbcr_u8_plugin_la_SOURCES = ycbcr_u8_plugin.cc
 noinst_HEADERS = ycbcr_u8_plugin.h kis_ycbcr_u8_colorspace.h

-chalk_ycbcr_u8_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
+chalk_ycbcr_u8_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
 chalk_ycbcr_u8_plugin_la_LIBADD =  libchalk_ycbcr_u8.la ../../chalkcolor/libchalkcolor.la

 METASOURCES = AUTO
--- a/chalk/core/Makefile.am
+++ b/chalk/core/Makefile.am
@ -45,7 +45,7 @@ include_HEADERS = kis_adjustment_layer.h kis_alpha_mask.h \
 		kis_filter_configuration.h kis_exif_info.h kis_exif_value.h kis_substrate.h kis_perspective_math.h kis_scale_visitor.h kis_paint_layer.h kis_layer_visitor.h kis_filter_strategy.h kis_transform_worker.h

 libchalkimage_la_LDFLAGS = -version-info 1:0:0 -no-undefined $(all_libraries)
-libchalkimage_la_LIBADD = ../sdk/libchalksdk.la ../chalkcolor/libchalkcolor.la tiles/libchalktile.la $(OPENEXR_LIBS) $(LCMS_LIBS) $(LIB_KOFFICECORE) $(LIB_KOPAINTER) $(LIB_TDECORE) $(LIB_QT) $(OPENEXR_LIBS) 
+libchalkimage_la_LIBADD = ../sdk/libchalksdk.la ../chalkcolor/libchalkcolor.la tiles/libchalktile.la $(OPENEXR_LIBS) $(LCMS_LIBS) $(LIB_KOFFICECORE) $(LIB_KOPAINTER) $(LIB_TDECORE) $(LIB_TQT) $(OPENEXR_LIBS) 

 if include_tdeunittest_tests
 TESTSDIR = tests
--- a/chalk/plugins/filters/blur/Makefile.am
+++ b/chalk/plugins/filters/blur/Makefile.am
@ -14,7 +14,7 @@ chalkblurfilter_la_SOURCES = wdgblur.ui blur.cc kis_blur_filter.cc kis_wdg_blur.
 kde_module_LTLIBRARIES = chalkblurfilter.la
 noinst_HEADERS = blur.h kis_blur_filter.h

-chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkblurfilter_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/filters/bumpmap/Makefile.am
+++ b/chalk/plugins/filters/bumpmap/Makefile.am
@ -12,7 +12,7 @@ chalkbumpmap_la_SOURCES = bumpmap.cc wdgbumpmap.ui
 kde_module_LTLIBRARIES = chalkbumpmap.la
 noinst_HEADERS = bumpmap.h

-chalkbumpmap_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkbumpmap_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkbumpmap_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/filters/cimg/Makefile.am
+++ b/chalk/plugins/filters/cimg/Makefile.am
@ -25,7 +25,7 @@ noinst_HEADERS = \
 	kis_cimg_plugin.h\
 	kis_cimgconfig_widget.h

-chalkcimg_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkcimg_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkcimg_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/filters/colorify/Makefile.am
+++ b/chalk/plugins/filters/colorify/Makefile.am
@ -14,7 +14,7 @@ INCLUDES = -I$(srcdir)/../../../sdk \
 kde_module_LTLIBRARIES = chalkcolorify.la


-chalkcolorify_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkcolorify_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkcolorify_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/filters/colors/Makefile.am
+++ b/chalk/plugins/filters/colors/Makefile.am
@ -14,7 +14,7 @@ chalkextensioncolorsfilters_la_SOURCES = colors.cc kis_minmax_filters.cc kis_col
 kde_module_LTLIBRARIES = chalkextensioncolorsfilters.la
 noinst_HEADERS = colors.h

-chalkextensioncolorsfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkextensioncolorsfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkextensioncolorsfilters_la_LIBADD = ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/filters/colorsfilters/Makefile.am
+++ b/chalk/plugins/filters/colorsfilters/Makefile.am
@ -17,7 +17,7 @@ noinst_HEADERS = colorsfilters.h \
 	kis_perchannel_filter.h \
 	kis_brightness_contrast_filter.h

-chalkcolorsfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkcolorsfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkcolorsfilters_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/filters/convolutionfilters/Makefile.am
+++ b/chalk/plugins/filters/convolutionfilters/Makefile.am
@ -21,7 +21,7 @@ noinst_HEADERS = convolutionfilters.h \
 	kis_custom_convolution_filter_configuration_widget.h \
 	kis_convolution_filter.h

-chalkconvolutionfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkconvolutionfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkconvolutionfilters_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/filters/embossfilter/Makefile.am
+++ b/chalk/plugins/filters/embossfilter/Makefile.am
@ -17,7 +17,7 @@ chalkembossfilter_la_SOURCES = kis_emboss_filter_plugin.cc \
 noinst_HEADERS = kis_emboss_filter_plugin.h \
        kis_emboss_filter.h

-chalkembossfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkembossfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkembossfilter_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/filters/example/Makefile.am
+++ b/chalk/plugins/filters/example/Makefile.am
@ -15,7 +15,7 @@ chalkexample_la_SOURCES = example.cc
 kde_module_LTLIBRARIES = chalkexample.la
 noinst_HEADERS = example.h

-chalkexample_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkexample_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkexample_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/filters/fastcolortransfer/Makefile.am
+++ b/chalk/plugins/filters/fastcolortransfer/Makefile.am
@ -16,7 +16,7 @@ chalkfastcolortransfer_la_SOURCES = wdgfastcolortransfer.ui fastcolortransfer.cc
 kde_module_LTLIBRARIES = chalkfastcolortransfer.la
 noinst_HEADERS = fastcolortransfer.h kis_wdg_fastcolortransfer.h

-chalkfastcolortransfer_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkfastcolortransfer_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkfastcolortransfer_la_LIBADD = $(LIB_KOFFICECORE) ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/filters/imageenhancement/Makefile.am
+++ b/chalk/plugins/filters/imageenhancement/Makefile.am
@ -15,7 +15,7 @@ chalkimageenhancement_la_SOURCES = imageenhancement.cpp \

 kde_module_LTLIBRARIES = chalkimageenhancement.la

-chalkimageenhancement_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkimageenhancement_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts

 noinst_HEADERS = imageenhancement.h kis_wavelet_noise_reduction.h

--- a/chalk/plugins/filters/lenscorrectionfilter/Makefile.am
+++ b/chalk/plugins/filters/lenscorrectionfilter/Makefile.am
@ -16,7 +16,7 @@ chalklenscorrectionfilter_la_SOURCES = lenscorrectionfilter.cc \
 kde_module_LTLIBRARIES = chalklenscorrectionfilter.la
 noinst_HEADERS = lenscorrectionfilter.h

-chalklenscorrectionfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalklenscorrectionfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalklenscorrectionfilter_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/filters/levelfilter/Makefile.am
+++ b/chalk/plugins/filters/levelfilter/Makefile.am
@ -16,7 +16,7 @@ noinst_HEADERS = levelfilter.h \
 	kis_level_filter.h \
 	kgradientslider.h

-chalklevelfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalklevelfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalklevelfilter_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/filters/noisefilter/Makefile.am
+++ b/chalk/plugins/filters/noisefilter/Makefile.am
@ -16,7 +16,7 @@ chalknoisefilter_la_SOURCES = noisefilter.cc wdgnoiseoptions.ui \
 kde_module_LTLIBRARIES = chalknoisefilter.la
 noinst_HEADERS = noisefilter.h kis_wdg_noise.h

-chalknoisefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalknoisefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalknoisefilter_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/filters/oilpaintfilter/Makefile.am
+++ b/chalk/plugins/filters/oilpaintfilter/Makefile.am
@ -17,7 +17,7 @@ chalkoilpaintfilter_la_SOURCES = kis_oilpaint_filter_plugin.cc \
 noinst_HEADERS = kis_oilpaint_filter_plugin.h \
 	kis_oilpaint_filter.h

-chalkoilpaintfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkoilpaintfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkoilpaintfilter_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/filters/pixelizefilter/Makefile.am
+++ b/chalk/plugins/filters/pixelizefilter/Makefile.am
@ -17,7 +17,7 @@ chalkpixelizefilter_la_SOURCES = kis_pixelize_filter_plugin.cc \
 noinst_HEADERS = kis_pixelize_filter_plugin.h \
 	kis_pixelize_filter.h

-chalkpixelizefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkpixelizefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkpixelizefilter_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/filters/raindropsfilter/Makefile.am
+++ b/chalk/plugins/filters/raindropsfilter/Makefile.am
@ -17,7 +17,7 @@ chalkraindropsfilter_la_SOURCES = kis_raindrops_filter_plugin.cc \
 noinst_HEADERS = kis_raindrops_filter_plugin.h \
 	kis_raindrops_filter.h

-chalkraindropsfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkraindropsfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkraindropsfilter_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/filters/randompickfilter/Makefile.am
+++ b/chalk/plugins/filters/randompickfilter/Makefile.am
@ -16,7 +16,7 @@ chalkrandompickfilter_la_SOURCES = randompickfilter.cc wdgrandompickoptions.ui \
 kde_module_LTLIBRARIES = chalkrandompickfilter.la
 noinst_HEADERS = randompickfilter.h

-chalkrandompickfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkrandompickfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkrandompickfilter_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/filters/roundcorners/Makefile.am
+++ b/chalk/plugins/filters/roundcorners/Makefile.am
@ -16,7 +16,7 @@ chalkroundcornersfilter_la_SOURCES = kis_round_corners_filter_plugin.cc \
 noinst_HEADERS = kis_round_corners_filter_plugin.h \
 	kis_round_corners_filter.h

-chalkroundcornersfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkroundcornersfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkroundcornersfilter_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/filters/smalltilesfilter/Makefile.am
+++ b/chalk/plugins/filters/smalltilesfilter/Makefile.am
@ -16,7 +16,7 @@ chalksmalltilesfilter_la_SOURCES = kis_small_tiles_filter_plugin.cc \
 noinst_HEADERS = kis_small_tiles_filter_plugin.h \
 	kis_small_tiles_filter.h

-chalksmalltilesfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalksmalltilesfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalksmalltilesfilter_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/filters/sobelfilter/Makefile.am
+++ b/chalk/plugins/filters/sobelfilter/Makefile.am
@ -16,7 +16,7 @@ chalksobelfilter_la_SOURCES = kis_sobel_filter_plugin.cc \
 noinst_HEADERS = kis_sobel_filter_plugin.h \
 	kis_sobel_filter.h

-chalksobelfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalksobelfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalksobelfilter_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/filters/unsharp/Makefile.am
+++ b/chalk/plugins/filters/unsharp/Makefile.am
@ -13,7 +13,7 @@ chalkunsharpfilter_la_SOURCES = wdgunsharp.ui kis_wdg_unsharp.cc unsharp.cc kis_

 kde_module_LTLIBRARIES = chalkunsharpfilter.la

-chalkunsharpfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkunsharpfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkunsharpfilter_la_LIBADD = ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/filters/wavefilter/Makefile.am
+++ b/chalk/plugins/filters/wavefilter/Makefile.am
@ -16,7 +16,7 @@ chalkwavefilter_la_SOURCES = wavefilter.cc wdgwaveoptions.ui \
 kde_module_LTLIBRARIES = chalkwavefilter.la
 noinst_HEADERS = wavefilter.h kis_wdg_wave.h

-chalkwavefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkwavefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkwavefilter_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/paintops/defaultpaintops/Makefile.am
+++ b/chalk/plugins/paintops/defaultpaintops/Makefile.am
@ -32,7 +32,7 @@ noinst_HEADERS = defaultpaintops_plugin.h 	kis_airbrushop.h 	kis_brushop.h \

 kde_module_LTLIBRARIES = chalkdefaultpaintops.la

-chalkdefaultpaintops_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkdefaultpaintops_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkdefaultpaintops_la_LIBADD =  ../../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE) \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/tools/defaulttools/Makefile.am
+++ b/chalk/plugins/tools/defaulttools/Makefile.am
@ -44,7 +44,7 @@ noinst_HEADERS = \
 	kis_tool_pan.h 


-chalkdefaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkdefaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkdefaulttools_la_LIBADD =  ../../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE) \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/tools/selectiontools/Makefile.am
+++ b/chalk/plugins/tools/selectiontools/Makefile.am
@ -28,7 +28,7 @@ noinst_HEADERS = \
 	kis_tool_select_elliptical.h 


-chalkselectiontools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkselectiontools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkselectiontools_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/tools/tool_crop/Makefile.am
+++ b/chalk/plugins/tools/tool_crop/Makefile.am
@ -21,7 +21,7 @@ noinst_HEADERS = \
 	tool_crop.h \
 	kis_tool_crop.h 

-chalktoolcrop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalktoolcrop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalktoolcrop_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/tools/tool_curves/Makefile.am
+++ b/chalk/plugins/tools/tool_curves/Makefile.am
@ -33,7 +33,7 @@ noinst_HEADERS = \
 	kis_tool_bezier_select.h \
 	kis_tool_moutline.h

-chalktoolcurves_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalktoolcurves_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalktoolcurves_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/tools/tool_filter/Makefile.am
+++ b/chalk/plugins/tools/tool_filter/Makefile.am
@ -22,7 +22,7 @@ noinst_HEADERS = \
 	kis_tool_filter.h \
 	tool_filter.h

-chalktoolfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalktoolfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalktoolfilter_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/tools/tool_perspectivegrid/Makefile.am
+++ b/chalk/plugins/tools/tool_perspectivegrid/Makefile.am
@ -20,7 +20,7 @@ noinst_HEADERS = \
 	tool_perspectivegrid.h \
 	kis_tool_perspectivegrid.h 

-chalktoolperspectivegrid_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalktoolperspectivegrid_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalktoolperspectivegrid_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/tools/tool_perspectivetransform/Makefile.am
+++ b/chalk/plugins/tools/tool_perspectivetransform/Makefile.am
@ -20,7 +20,7 @@ noinst_HEADERS = \
 	tool_perspectivetransform.h \
 	kis_tool_perspectivetransform.h 

-chalktoolperspectivetransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalktoolperspectivetransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalktoolperspectivetransform_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/tools/tool_polygon/Makefile.am
+++ b/chalk/plugins/tools/tool_polygon/Makefile.am
@ -20,7 +20,7 @@ noinst_HEADERS = \
 	tool_polygon.h \
 	kis_tool_polygon.h 

-chalktoolpolygon_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalktoolpolygon_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalktoolpolygon_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/tools/tool_polyline/Makefile.am
+++ b/chalk/plugins/tools/tool_polyline/Makefile.am
@ -20,7 +20,7 @@ noinst_HEADERS = \
 	tool_polyline.h \
 	kis_tool_polyline.h 

-chalktoolpolyline_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalktoolpolyline_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalktoolpolyline_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/tools/tool_selectsimilar/Makefile.am
+++ b/chalk/plugins/tools/tool_selectsimilar/Makefile.am
@ -14,7 +14,7 @@ noinst_HEADERS = selectsimilar.h kis_tool_selectsimilar.h

 kde_module_LTLIBRARIES = chalktoolselectsimilar.la

-chalktoolselectsimilar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalktoolselectsimilar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalktoolselectsimilar_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/tools/tool_star/Makefile.am
+++ b/chalk/plugins/tools/tool_star/Makefile.am
@ -21,7 +21,7 @@ noinst_HEADERS = \
 	tool_star.h \
 	kis_tool_star.h 

-chalktoolstar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalktoolstar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalktoolstar_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/tools/tool_transform/Makefile.am
+++ b/chalk/plugins/tools/tool_transform/Makefile.am
@ -21,7 +21,7 @@ noinst_HEADERS = \
 	tool_transform.h \
 	kis_tool_transform.h 

-chalktooltransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalktooltransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalktooltransform_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/viewplugins/colorrange/Makefile.am
+++ b/chalk/plugins/viewplugins/colorrange/Makefile.am
@ -14,7 +14,7 @@ chalkcolorrange_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
 	../../../../chalk/ui/libchalkui.la
-chalkcolorrange_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkcolorrange_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts

 chalkrcdir = $(kde_datadir)/chalkplugins
 chalkrc_DATA = colorrange.rc
--- a/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am
+++ b/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am
@ -17,7 +17,7 @@ kde_module_LTLIBRARIES = chalkcolorspaceconversion.la
 chalkcolorspaceconversion_la_SOURCES = wdgconvertcolorspace.ui colorspaceconversion.cc dlg_colorspaceconversion.cc
 noinst_HEADERS = wdgconvertcolorspace.h dlg_colorspaceconversion.h colorspaceconversion.h

-chalkcolorspaceconversion_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkcolorspaceconversion_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkcolorspaceconversion_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/viewplugins/dropshadow/Makefile.am
+++ b/chalk/plugins/viewplugins/dropshadow/Makefile.am
@ -20,7 +20,7 @@ chalkdropshadow_la_SOURCES = wdg_dropshadow.ui \
 noinst_HEADERS = wdg_dropshadow.h kis_dropshadow_plugin.h \
 		kis_dropshadow.h dlg_dropshadow.h

-chalkdropshadow_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkdropshadow_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkdropshadow_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la ../../../colorspaces/rgb_u8/libchalkrgb.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/viewplugins/filtersgallery/Makefile.am
+++ b/chalk/plugins/viewplugins/filtersgallery/Makefile.am
@ -19,7 +19,7 @@ noinst_HEADERS = filters_gallery.h kis_dlg_filtersgallery.h

 kde_services_DATA = chalkfiltersgallery.desktop

-chalkfiltersgallery_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkfiltersgallery_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkfiltersgallery_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/viewplugins/histogram/Makefile.am
+++ b/chalk/plugins/viewplugins/histogram/Makefile.am
@ -18,7 +18,7 @@ noinst_HEADERS = dlg_histogram.h histogram.h wdghistogram.h kis_histogram_widget

 kde_services_DATA = chalkhistogram.desktop

-chalkhistogram_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkhistogram_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkhistogram_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/viewplugins/histogram_docker/Makefile.am
+++ b/chalk/plugins/viewplugins/histogram_docker/Makefile.am
@ -15,7 +15,7 @@ chalkhistogramdocker_la_SOURCES = histogramdocker.cc  kis_imagerasteredcache.cc
 kde_module_LTLIBRARIES = chalkhistogramdocker.la
 noinst_HEADERS = histogramdocker.h kis_imagerasteredcache.h kis_cachedhistogram.h kis_accumulating_producer.h

-chalkhistogramdocker_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkhistogramdocker_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkhistogramdocker_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/viewplugins/imagesize/Makefile.am
+++ b/chalk/plugins/viewplugins/imagesize/Makefile.am
@ -18,7 +18,7 @@ noinst_HEADERS = wdg_imagesize.h dlg_imagesize.h imagesize.h dlg_layersize.h

 kde_module_LTLIBRARIES = chalkimagesize.la

-chalkimagesize_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkimagesize_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkimagesize_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/viewplugins/modify_selection/Makefile.am
+++ b/chalk/plugins/viewplugins/modify_selection/Makefile.am
@ -20,7 +20,7 @@ dlg_shrink_selection.h dlg_border_selection.h modify_selection.h

 kde_module_LTLIBRARIES = chalkmodifyselection.la

-chalkmodifyselection_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkmodifyselection_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkmodifyselection_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/viewplugins/performancetest/Makefile.am
+++ b/chalk/plugins/viewplugins/performancetest/Makefile.am
@ -16,7 +16,7 @@ kde_module_LTLIBRARIES = chalkperftest.la
 chalkperftest_la_SOURCES = wdg_perftest.ui perftest.cc dlg_perftest.cc
 noinst_HEADERS = wdg_perftest.h dlg_perftest.h perftest.h

-chalkperftest_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkperftest_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkperftest_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/viewplugins/rotateimage/Makefile.am
+++ b/chalk/plugins/viewplugins/rotateimage/Makefile.am
@ -16,7 +16,7 @@ kde_module_LTLIBRARIES = chalkrotateimage.la
 chalkrotateimage_la_SOURCES = wdg_rotateimage.ui rotateimage.cc dlg_rotateimage.cc
 noinst_HEADERS = wdg_rotateimage.h dlg_rotateimage.h rotateimage.h

-chalkrotateimage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkrotateimage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkrotateimage_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/viewplugins/screenshot/Makefile.am
+++ b/chalk/plugins/viewplugins/screenshot/Makefile.am
@ -15,7 +15,7 @@ kde_module_LTLIBRARIES = chalkscreenshot.la
 chalkscreenshot_la_SOURCES = screenshot.cpp ksnapshot.cpp regiongrabber.cpp ksnapshotwidget.ui
 noinst_HEADERS = screenshot.h ksnapshot.h regiongrabber.h ksnapshotwidget.h ksnapshotwidget.ui.h

-chalkscreenshot_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -ltdeprint
+chalkscreenshot_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -ltdeprint
 chalkscreenshot_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/viewplugins/scripting/Makefile.am
+++ b/chalk/plugins/viewplugins/scripting/Makefile.am
@ -20,7 +20,7 @@ chalkscripting_la_SOURCES = scripting.cc
 kde_module_LTLIBRARIES = chalkscripting.la
 noinst_HEADERS = scripting.h

-chalkscripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkscripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkscripting_la_LIBADD = $(LIB_KOFFICEUI) $(top_builddir)/chalk/libchalkcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la ./chalkscripting/libchalkscripting.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am
@ -11,10 +11,10 @@ krosschalkcore_la_SOURCES = chalkcoremodule.cpp krs_doc.cpp krs_paint_layer.cpp
 	krs_brush.cpp krs_pattern.cpp krs_filter.cpp krs_filter_configuration.cpp \
 	krs_wavelet.cpp

-krosschalkcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+krosschalkcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 krosschalkcore_la_LIBADD = \
    $(LIB_KOFFICE_CORE) $(LIB_KOFFICEUI) \
-    $(LIB_QT) \
+    $(LIB_TQT) \
    $(LIB_TDECORE) \
    $(top_builddir)/lib/kross/api/libkrossapi.la \
    $(top_builddir)/lib/kross/main/libkrossmain.la \
--- a/chalk/plugins/viewplugins/selectopaque/Makefile.am
+++ b/chalk/plugins/viewplugins/selectopaque/Makefile.am
@ -14,7 +14,7 @@ chalkselectopaque_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
 	../../../../chalk/ui/libchalkui.la
-chalkselectopaque_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkselectopaque_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts

 chalkrcdir = $(kde_datadir)/chalkplugins
 chalkrc_DATA = selectopaque.rc
--- a/chalk/plugins/viewplugins/separate_channels/Makefile.am
+++ b/chalk/plugins/viewplugins/separate_channels/Makefile.am
@ -20,7 +20,7 @@ noinst_HEADERS = wdg_separations.h kis_separate_channels_plugin.h \

 kde_services_DATA = chalkseparatechannels.desktop

-chalkseparatechannels_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkseparatechannels_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkseparatechannels_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/viewplugins/shearimage/Makefile.am
+++ b/chalk/plugins/viewplugins/shearimage/Makefile.am
@ -18,7 +18,7 @@ kde_services_DATA = chalkshearimage.desktop
 chalkshearimage_la_SOURCES = wdg_shearimage.ui shearimage.cc dlg_shearimage.cc
 noinst_HEADERS = wdg_shearimage.h dlg_shearimage.h shearimage.h

-chalkshearimage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkshearimage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkshearimage_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/viewplugins/substrate/Makefile.am
+++ b/chalk/plugins/viewplugins/substrate/Makefile.am
@ -17,7 +17,7 @@ kde_module_LTLIBRARIES = chalksubstrate.la
 chalksubstrate_la_SOURCES = substrate.cc dlg_substrate.cc wdgsubstrate.ui kis_repeating_substrate.cc
 noinst_HEADERS = wdgsubstrate.h dlg_substrate.h kis_repeating_substrate.h substrate.h

-chalksubstrate_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalksubstrate_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalksubstrate_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/chalk/plugins/viewplugins/variations/Makefile.am
+++ b/chalk/plugins/viewplugins/variations/Makefile.am
@ -17,7 +17,7 @@ kde_module_LTLIBRARIES = chalkvariations.la
 chalkvariations_la_SOURCES = variations.cc dlg_variations.cc wdg_variations.ui 
 noinst_HEADERS = wdg_variations.h

-chalkvariations_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkvariations_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 chalkvariations_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
--- a/filters/chalk/gmagick/Makefile.am
+++ b/filters/chalk/gmagick/Makefile.am
@ -1,6 +1,6 @@
 kde_module_LTLIBRARIES = libchalkgmagickimport.la libchalkgmagickexport.la

-libchalkgmagickexport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBGMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBGMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts \
+libchalkgmagickexport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBGMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBGMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts \
        -llcms
 libchalkgmagickexport_la_LIBADD = \
 	$(KOFFICE_LIBS) \
@ -10,7 +10,7 @@ libchalkgmagickexport_la_LIBADD = \
 	../../../chalk/ui/libchalkui.la \
 	../../../chalk/chalkcolor/libchalkcolor.la

-libchalkgmagickimport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBGMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBGMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts \
+libchalkgmagickimport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBGMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBGMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts \
        -llcms
 libchalkgmagickimport_la_LIBADD = \
 	$(KOFFICE_LIBS) \
--- a/filters/chalk/jpeg/Makefile.am
+++ b/filters/chalk/jpeg/Makefile.am
@ -1,7 +1,7 @@
 noinst_LTLIBRARIES = libchalkconverter.la
 kde_module_LTLIBRARIES = libchalkjpegimport.la libchalkjpegexport.la

-libchalkconverter_la_LDFLAGS = $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts \
+libchalkconverter_la_LDFLAGS = $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts \
        -llcms
 libchalkconverter_la_SOURCES = kis_jpeg_converter.cc iccjpeg.c
 libchalkconverter_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/filters/chalk/libkisexif/libkisexif.la \
@ -10,7 +10,7 @@ libchalkconverter_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/filters/chalk/libk
 	../../../chalk/chalkcolor/libchalkcolor.la

 libchalkjpegexport_la_LDFLAGS = -avoid-version -module -no-undefined \
-	$(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts \
+	$(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts \
        -llcms
 libchalkjpegexport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \
 	libchalkconverter.la $(KOFFICE_LIBS) \
@ -20,7 +20,7 @@ libchalkjpegexport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \
 	-ljpeg -lexif

 libchalkjpegimport_la_LDFLAGS = -avoid-version -module -no-undefined \
-	$(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts \
+	$(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts \
        -llcms
 libchalkjpegimport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \
 	libchalkconverter.la $(KOFFICE_LIBS) \
--- a/filters/chalk/libkisexif/Makefile.am
+++ b/filters/chalk/libkisexif/Makefile.am
@ -11,7 +11,7 @@ INCLUDES = \
        $(KOPAINTER_INCLUDES) \
        $(all_includes) 
 METASOURCES = AUTO
-libkisexif_la_LDFLAGS = $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts \
+libkisexif_la_LDFLAGS = $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts \
        -llcms
 libkisexif_la_LIBADD = $(KOFFICE_LIBS) \
 	../../../chalk/core/libchalkimage.la \
--- a/filters/chalk/magick/Makefile.am
+++ b/filters/chalk/magick/Makefile.am
@ -1,6 +1,6 @@
 kde_module_LTLIBRARIES = libchalkmagickimport.la libchalkmagickexport.la

-libchalkmagickexport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts \
+libchalkmagickexport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts \
        -llcms
 libchalkmagickexport_la_LIBADD = \
 	$(KOFFICE_LIBS) \
@ -10,7 +10,7 @@ libchalkmagickexport_la_LIBADD = \
 	../../../chalk/ui/libchalkui.la \
 	../../../chalk/chalkcolor/libchalkcolor.la

-libchalkmagickimport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts \
+libchalkmagickimport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts \
        -llcms
 libchalkmagickimport_la_LIBADD = \
 	$(KOFFICE_LIBS) \
--- a/filters/chalk/openexr/Makefile.am
+++ b/filters/chalk/openexr/Makefile.am
@ -15,7 +15,7 @@ AM_CPPFLAGS= \

 kde_module_LTLIBRARIES = libchalk_openexr_import.la libchalk_openexr_export.la

-libchalk_openexr_export_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libchalk_openexr_export_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libchalk_openexr_export_la_LIBADD = \
 	$(KOFFICE_LIBS) \
 	$(OPENEXR_LIBS) \
@ -27,7 +27,7 @@ libchalk_openexr_export_la_LIBADD = \
 	../../../chalk/chalkcolor/libchalkcolor.la


-libchalk_openexr_import_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libchalk_openexr_import_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libchalk_openexr_import_la_LIBADD = \
 	$(KOFFICE_LIBS) \
 	$(OPENEXR_LIBS) \
--- a/filters/chalk/pdf/Makefile.am
+++ b/filters/chalk/pdf/Makefile.am
@ -17,7 +17,7 @@ kdelnkdir = $(kde_appsdir)/.hidden

 METASOURCES = AUTO
 kde_module_LTLIBRARIES = libchalkpdfimport.la
-libchalkpdfimport_la_LDFLAGS = -avoid-version -module -no-undefined  $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts \
+libchalkpdfimport_la_LDFLAGS = -avoid-version -module -no-undefined  $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts \
        -llcms
 libchalkpdfimport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \
 	-lpoppler-tqt $(KOFFICE_LIBS) $(POPPLER_LIBS) \
--- a/filters/chalk/png/Makefile.am
+++ b/filters/chalk/png/Makefile.am
@ -1,6 +1,6 @@
 kde_module_LTLIBRARIES = libchalkpngimport.la libchalkpngexport.la

-libchalkpngexport_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts \
+libchalkpngexport_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts \
        -llcms
 libchalkpngexport_la_LIBADD = \
 	$(KOFFICE_LIBS) \
@ -10,7 +10,7 @@ libchalkpngexport_la_LIBADD = \
 	../../../chalk/chalkcolor/libchalkcolor.la \
 	-lpng

-libchalkpngimport_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts \
+libchalkpngimport_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts \
        -llcms
 libchalkpngimport_la_LIBADD = \
 	$(KOFFICE_LIBS) \
--- a/filters/chalk/raw/Makefile.am
+++ b/filters/chalk/raw/Makefile.am
@ -11,7 +11,7 @@ AM_CPPFLAGS= \

 kde_module_LTLIBRARIES = libchalk_raw_import.la 

-libchalk_raw_import_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts \
+libchalk_raw_import_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts \
        -llcms
 libchalk_raw_import_la_LIBADD = \
 	$(KOFFICE_LIBS) \
--- a/filters/chalk/tiff/Makefile.am
+++ b/filters/chalk/tiff/Makefile.am
@ -1,7 +1,7 @@
 kde_module_LTLIBRARIES = libchalktiffimport.la libchalktiffexport.la

 libchalktiffexport_la_LDFLAGS = -avoid-version -module -no-undefined \
-	$(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts \
+	$(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts \
        -llcms
 libchalktiffexport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \
 	libchalktiffconverter.la $(KOFFICE_LIBS) \
@ -11,7 +11,7 @@ libchalktiffexport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \
 	-ltiff

 libchalktiffimport_la_LDFLAGS = -avoid-version -module -no-undefined \
-	$(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts \
+	$(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts \
        -llcms
 libchalktiffimport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \
 	libchalktiffconverter.la $(KOFFICE_LIBS) \
@ -53,7 +53,7 @@ service_DATA = chalk_tiff_export.desktop chalk_tiff_import.desktop
 kdelnk_DATA = chalk_tiff.desktop
 noinst_HEADERS = kis_dlg_options_tiff.h kis_tiff_writer_visitor.h \
 	kis_tiff_ycbcr_reader.h
-libchalktiffconverter_la_LDFLAGS = -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts \
+libchalktiffconverter_la_LDFLAGS = -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts \
        -llcms
 libchalktiffconverter_la_LIBADD = $(KOFFICE_LIBS) \
 	../../../chalk/core/libchalkimage.la \
--- a/filters/chalk/xcf/Makefile.am
+++ b/filters/chalk/xcf/Makefile.am
@ -1,6 +1,6 @@
 kde_module_LTLIBRARIES = libchalkxcfimport.la libchalkxcfexport.la

-libchalkxcfexport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts \
+libchalkxcfexport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts \
        -llcms
 libchalkxcfexport_la_LIBADD = \
 	$(KOFFICE_LIBS) \
@ -10,7 +10,7 @@ libchalkxcfexport_la_LIBADD = \
 	../../../chalk/ui/libchalkui.la \
 	../../../chalk/chalkcolor/libchalkcolor.la

-libchalkxcfimport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts \
+libchalkxcfimport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts \
        -llcms
 libchalkxcfimport_la_LIBADD = \
 	$(KOFFICE_LIBS) \
--- a/filters/karbon/eps/Makefile.am
+++ b/filters/karbon/eps/Makefile.am
@ -6,11 +6,11 @@ libkarbonepsexport_la_SOURCES = \
 	epsexport.cc \
 	epsexportdlg.cc

-libkarbonepsexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkarbonepsexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkarbonepsexport_la_LIBADD  = $(KOFFICE_LIBS) ../../../karbon/libkarboncommon.la

 libkarbonepsimport_la_SOURCES = epsimport.cc pscommentlexer.cc
-libkarbonepsimport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkarbonepsimport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkarbonepsimport_la_LIBADD  = $(KOFFICE_LIBS)

 INCLUDES = \
--- a/filters/karbon/kontour/Makefile.am
+++ b/filters/karbon/kontour/Makefile.am
@ -10,7 +10,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(KOPAINTER_INCLUDES) -I$(top_srcdir)/
 kde_module_LTLIBRARIES = libkarbonkontourimport.la

 libkarbonkontourimport_la_SOURCES = kontourimport.cpp
-libkarbonkontourimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkarbonkontourimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkarbonkontourimport_la_LIBADD = $(KOFFICE_LIBS) ../../../karbon/libkarboncommon.la

 METASOURCES = AUTO
--- a/filters/karbon/png/Makefile.am
+++ b/filters/karbon/png/Makefile.am
@ -1,6 +1,6 @@
 kde_module_LTLIBRARIES = libkarbonpngexport.la

-libkarbonpngexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkarbonpngexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkarbonpngexport_la_LIBADD = \
 	$(KOFFICE_LIBS) \
 	../../../karbon/libkarboncommon.la
--- a/filters/karbon/svg/Makefile.am
+++ b/filters/karbon/svg/Makefile.am
@ -1,11 +1,11 @@
 kde_module_LTLIBRARIES = libkarbonsvgexport.la libkarbonsvgimport.la

-libkarbonsvgexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkarbonsvgexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkarbonsvgexport_la_LIBADD = \
 	$(KOFFICE_LIBS) \
 	../../../karbon/libkarboncommon.la

-libkarbonsvgimport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkarbonsvgimport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkarbonsvgimport_la_LIBADD = \
 	$(KOFFICE_LIBS) \
 	../../../karbon/libkarboncommon.la
--- a/filters/karbon/wmf/Makefile.am
+++ b/filters/karbon/wmf/Makefile.am
@ -11,11 +11,11 @@ INCLUDES= \

 kde_module_LTLIBRARIES = libwmfimport.la libwmfexport.la

-libwmfimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libwmfimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libwmfimport_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KOWMF) ../../../karbon/libkarboncommon.la
 libwmfimport_la_SOURCES = wmfimport.cc wmfimportparser.cc

-libwmfexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libwmfexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libwmfexport_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KOWMF) ../../../karbon/libkarboncommon.la
 libwmfexport_la_SOURCES = wmfexport.cc

--- a/filters/karbon/xcf/Makefile.am
+++ b/filters/karbon/xcf/Makefile.am
@ -1,6 +1,6 @@
 kde_module_LTLIBRARIES = libkarbonxcfexport.la

-libkarbonxcfexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkarbonxcfexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkarbonxcfexport_la_LIBADD = \
 	$(KOFFICE_LIBS) \
 	../../../karbon/libkarboncommon.la
--- a/filters/kchart/bmp/Makefile.am
+++ b/filters/kchart/bmp/Makefile.am
@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
 kde_module_LTLIBRARIES = libkchartbmpexport.la

 libkchartbmpexport_la_SOURCES = bmpexport.cpp
-libkchartbmpexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkchartbmpexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkchartbmpexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS)
 noinst_HEADERS = \
 	bmpexport.h
--- a/filters/kchart/jpeg/Makefile.am
+++ b/filters/kchart/jpeg/Makefile.am
@ -13,7 +13,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
 kde_module_LTLIBRARIES = libkchartjpegexport.la

 libkchartjpegexport_la_SOURCES = jpegexport.cpp
-libkchartjpegexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkchartjpegexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkchartjpegexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS)
 
 noinst_HEADERS = \
--- a/filters/kchart/mng/Makefile.am
+++ b/filters/kchart/mng/Makefile.am
@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
 kde_module_LTLIBRARIES = libkchartmngexport.la

 libkchartmngexport_la_SOURCES = mngexport.cpp
-libkchartmngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkchartmngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkchartmngexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS)
 noinst_HEADERS = \
 	mngexport.h
--- a/filters/kchart/png/Makefile.am
+++ b/filters/kchart/png/Makefile.am
@ -13,7 +13,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
 kde_module_LTLIBRARIES = libkchartpngexport.la

 libkchartpngexport_la_SOURCES = pngexport.cpp
-libkchartpngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkchartpngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkchartpngexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS)
 noinst_HEADERS = \
 	pngexport.h 
--- a/filters/kchart/svg/Makefile.am
+++ b/filters/kchart/svg/Makefile.am
@ -10,7 +10,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
 kde_module_LTLIBRARIES = libkchartsvgexport.la

 libkchartsvgexport_la_SOURCES = svgexport.cc
-libkchartsvgexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkchartsvgexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkchartsvgexport_la_LIBADD = ../../../kchart/libkchartcommon.la $(KOFFICE_LIBS)
 noinst_HEADERS = \
 	svgexport.h
--- a/filters/kchart/xbm/Makefile.am
+++ b/filters/kchart/xbm/Makefile.am
@ -13,7 +13,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
 kde_module_LTLIBRARIES = libkchartxbmexport.la

 libkchartxbmexport_la_SOURCES = xbmexport.cpp
-libkchartxbmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkchartxbmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkchartxbmexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS)
 noinst_HEADERS = \
 	xbmexport.h
--- a/filters/kchart/xpm/Makefile.am
+++ b/filters/kchart/xpm/Makefile.am
@ -13,7 +13,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
 kde_module_LTLIBRARIES = libkchartxpmexport.la

 libkchartxpmexport_la_SOURCES = xpmexport.cpp
-libkchartxpmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkchartxpmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkchartxpmexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS)
 noinst_HEADERS = \
 	xpmexport.h
--- a/filters/kformula/latex/Makefile.am
+++ b/filters/kformula/latex/Makefile.am
@ -16,7 +16,7 @@ noinst_HEADERS = latexexport.h
 #check_PROGRAMS = texlauncher
 #texlauncher_SOURCES = texlauncher.cc
 #texlauncher_LDADD = liblatexexport.la
-#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor


 METASOURCES = AUTO
--- a/filters/kformula/png/Makefile.am
+++ b/filters/kformula/png/Makefile.am
@ -16,7 +16,7 @@ noinst_HEADERS = pngexport.h pngexportdia.h
 #check_PROGRAMS = texlauncher
 #texlauncher_SOURCES = texlauncher.cc
 #texlauncher_LDADD = liblatexexport.la
-#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor


 METASOURCES = AUTO
--- a/filters/kformula/svg/Makefile.am
+++ b/filters/kformula/svg/Makefile.am
@ -16,7 +16,7 @@ noinst_HEADERS = svgexport.h
 #check_PROGRAMS = texlauncher
 #texlauncher_SOURCES = texlauncher.cc
 #texlauncher_LDADD = liblatexexport.la
-#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor


 METASOURCES = AUTO
--- a/filters/kivio/imageexport/Makefile.am
+++ b/filters/kivio/imageexport/Makefile.am
@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = libkivioimageexport.la

 libkivioimageexport_la_SOURCES = kivio_imageexport.cpp \
 	kivio_imageexportwidget.ui kivio_imageexportdialog.cpp
-libkivioimageexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkivioimageexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkivioimageexport_la_LIBADD = $(top_builddir)/kivio/kiviopart/libkiviocommon.la $(KOFFICE_LIBS)

 service_DATA = kivio_image_export.desktop
--- a/filters/kpresenter/bmp/Makefile.am
+++ b/filters/kpresenter/bmp/Makefile.am
@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
 kde_module_LTLIBRARIES = libkpresenterbmpexport.la

 libkpresenterbmpexport_la_SOURCES = bmpexport.cpp
-libkpresenterbmpexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkpresenterbmpexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkpresenterbmpexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS)
 noinst_HEADERS = \
 	bmpexport.h
--- a/filters/kpresenter/jpeg/Makefile.am
+++ b/filters/kpresenter/jpeg/Makefile.am
@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
 kde_module_LTLIBRARIES = libkpresenterjpegexport.la

 libkpresenterjpegexport_la_SOURCES = jpegexport.cpp
-libkpresenterjpegexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkpresenterjpegexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkpresenterjpegexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS)
 noinst_HEADERS = \
 	jpegexport.h
--- a/filters/kpresenter/mng/Makefile.am
+++ b/filters/kpresenter/mng/Makefile.am
@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
 kde_module_LTLIBRARIES = libkpresentermngexport.la

 libkpresentermngexport_la_SOURCES = mngexport.cpp
-libkpresentermngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkpresentermngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkpresentermngexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS)
 noinst_HEADERS = \
 	mngexport.h
--- a/filters/kpresenter/png/Makefile.am
+++ b/filters/kpresenter/png/Makefile.am
@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
 kde_module_LTLIBRARIES = libkpresenterpngexport.la

 libkpresenterpngexport_la_SOURCES = pngexport.cpp
-libkpresenterpngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkpresenterpngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkpresenterpngexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS)
 noinst_HEADERS = \
 	pngexport.h
--- a/filters/kpresenter/svg/Makefile.am
+++ b/filters/kpresenter/svg/Makefile.am
@ -9,7 +9,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
 kde_module_LTLIBRARIES = libkpresentersvgexport.la

 libkpresentersvgexport_la_SOURCES = svgexport.cc
-libkpresentersvgexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkpresentersvgexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkpresentersvgexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la $(KOFFICE_LIBS)
 noinst_HEADERS = \
 	svgexport.h
--- a/filters/kpresenter/xbm/Makefile.am
+++ b/filters/kpresenter/xbm/Makefile.am
@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
 kde_module_LTLIBRARIES = libkpresenterxbmexport.la

 libkpresenterxbmexport_la_SOURCES = xbmexport.cpp
-libkpresenterxbmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkpresenterxbmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkpresenterxbmexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS)
 noinst_HEADERS = \
 	xbmexport.h
--- a/filters/kpresenter/xpm/Makefile.am
+++ b/filters/kpresenter/xpm/Makefile.am
@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
 kde_module_LTLIBRARIES = libkpresenterxpmexport.la

 libkpresenterxpmexport_la_SOURCES = xpmexport.cpp
-libkpresenterxpmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkpresenterxpmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkpresenterxpmexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS)
 noinst_HEADERS = \
 	xpmexport.h
--- a/filters/kspread/applixspread/Makefile.am
+++ b/filters/kspread/applixspread/Makefile.am
@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libapplixspreadimport.la

 libapplixspreadimport_la_SOURCES = applixspreadimport.cc
 libapplixspreadimport_la_LIBADD = $(KOFFICE_LIBS)
-libapplixspreadimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libapplixspreadimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 noinst_HEADERS = applixspreadimport.h

 METASOURCES = AUTO
--- a/filters/kspread/dbase/Makefile.am
+++ b/filters/kspread/dbase/Makefile.am
@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libdbaseimport.la

 libdbaseimport_la_SOURCES = dbaseimport.cc dbase.cpp
 libdbaseimport_la_LIBADD = $(KOFFICE_LIBS)
-libdbaseimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libdbaseimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 noinst_HEADERS = dbaseimport.h dbase.h

 METASOURCES = AUTO
--- a/filters/kspread/excel/import/Makefile.am
+++ b/filters/kspread/excel/import/Makefile.am
@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libexcelimport.la

 libexcelimport_la_SOURCES = excelimport.cc 
 libexcelimport_la_LIBADD = $(KOFFICE_LIBS) ../sidewinder/libsidewinder.la
-libexcelimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libexcelimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 noinst_HEADERS = excelimport.h

 METASOURCES = AUTO
--- a/filters/kspread/latex/export/Makefile.am
+++ b/filters/kspread/latex/export/Makefile.am
@ -22,7 +22,7 @@ noinst_HEADERS = cell.h column.h config.h document.h fileheader.h format.h \
 #check_PROGRAMS = texlauncher
 #texlauncher_SOURCES = texlauncher.cc
 #texlauncher_LDADD = liblatexexport.la
-#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

 METASOURCES = AUTO

--- a/filters/kugar/kugarnop/Makefile.am
+++ b/filters/kugar/kugarnop/Makefile.am
@ -5,7 +5,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = libkugarnopimport.la

 libkugarnopimport_la_SOURCES = kugarnopimport.cpp
-libkugarnopimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkugarnopimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkugarnopimport_la_LIBADD = $(KOFFICE_LIBS)

 noinst_HEADERS = kugarnopimport.h 
--- a/filters/kword/hancomword/Makefile.am
+++ b/filters/kword/hancomword/Makefile.am
@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libhancomwordimport.la

 libhancomwordimport_la_SOURCES = pole.cpp hancomwordimport.cpp
 libhancomwordimport_la_LIBADD = $(KOFFICE_LIBS) 
-libhancomwordimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libhancomwordimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 noinst_HEADERS = pole.h hancomwordimport.h

 METASOURCES = AUTO
--- a/filters/kword/latex/export/Makefile.am
+++ b/filters/kword/latex/export/Makefile.am
@ -20,7 +20,7 @@ libkwordlatexexport_la_SOURCES = anchor.cc config.cc document.cc element.cc file
 #check_PROGRAMS = texlauncher
 #texlauncher_SOURCES = texlauncher.cc
 #texlauncher_LDADD = liblatexexport.la
-#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

 METASOURCES = AUTO

--- a/filters/kword/latex/import/Makefile.am
+++ b/filters/kword/latex/import/Makefile.am
@ -19,7 +19,7 @@ noinst_HEADERS = config.h lateximport.h lateximportdia.h
 #check_PROGRAMS = texlauncher
 #texlauncher_SOURCES = texlauncher.cc
 #texlauncher_LDADD = liblatexexport.la
-#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor


 METASOURCES = AUTO
--- a/filters/kword/latex/import/parser/Makefile.am
+++ b/filters/kword/latex/import/parser/Makefile.am
@ -25,7 +25,7 @@ texscaner.cc: $(srcdir)/texscaner.y
 check_PROGRAMS = texlauncher
 texlauncher_SOURCES = texlauncher.cc
 texlauncher_LDADD = liblatexexport.la
-texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor


 METASOURCES = AUTO
--- a/filters/kword/msword/Makefile.am
+++ b/filters/kword/msword/Makefile.am
@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = libmswordimport.la

 libmswordimport_la_SOURCES = mswordimport.cpp document.cpp conversion.cpp \
 	texthandler.cpp tablehandler.cpp graphicshandler.cpp
-libmswordimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libmswordimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libmswordimport_la_LIBADD = $(KOFFICE_LIBS) $(LIBWV2_LIBS) $(LIBXML_LIBS)

 METASOURCES = AUTO
--- a/filters/kword/mswrite/Makefile.am
+++ b/filters/kword/mswrite/Makefile.am
@ -9,12 +9,12 @@ kde_module_LTLIBRARIES = libmswriteimport.la libmswriteexport.la
 libmswriteimport_la_SOURCES = mswriteimport.cc \
 								libmswrite_defs.cpp structures_generated.cpp structures_private.cpp structures.cpp libmswrite.cpp ImportDialogUI.ui ImportDialog.cc

-libmswriteimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libmswriteimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libmswriteimport_la_LIBADD = $(KOFFICE_LIBS)

 libmswriteexport_la_SOURCES = mswriteexport.cc	\
 								libmswrite_defs.cpp structures_generated.cpp structures_private.cpp structures.cpp libmswrite.cpp
-libmswriteexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libmswriteexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libmswriteexport_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KOWMF) ../libexport/libkwordexportfilters.la

 noinst_HEADERS = mswriteimport.h mswriteexport.h \
--- a/filters/kword/pdf/Makefile.am
+++ b/filters/kword/pdf/Makefile.am
@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = libpdfimport.la
 libpdfimport_la_SOURCES = misc.cpp transform.cpp data.cpp fstring.cpp \
                          FilterPage.cpp FilterDevice.cpp \
                          pdfdocument.cpp dialog.cpp pdfimport.cpp
-libpdfimport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libpdfimport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libpdfimport_la_LIBADD = $(KOFFICE_LIBS) $(LIBPAPER) ./xpdf/xpdf/libxpdf.la ./xpdf/goo/libgoo.la

 METASOURCES = dialog.moc pdfimport.moc
--- a/filters/xsltfilter/export/Makefile.am
+++ b/filters/xsltfilter/export/Makefile.am
@ -9,7 +9,7 @@ CXXFLAGS += $(ICU_CXXFLAGS)
 kde_module_LTLIBRARIES = libxsltexport.la

 libxsltexport_la_SOURCES = xsltexport.cc xsltexportdia.cc xsltproc.cc xsltdialog.ui
-libxsltexport_la_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries) -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libxsltexport_la_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries) -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libxsltexport_la_LIBADD	= $(KOFFICE_LIBS) $(LIBXSLT_LIBS) $(LIBXML_LIBS)

 noinst_HEADERS = xsltexport.h xsltexportdia.h xsltproc.h
--- a/filters/xsltfilter/import/Makefile.am
+++ b/filters/xsltfilter/import/Makefile.am
@ -8,7 +8,7 @@ CXXFLAGS += $(ICU_CXXFLAGS)
 kde_module_LTLIBRARIES = libxsltimport.la

 libxsltimport_la_SOURCES = xsltimport.cc xsltimportdia.cc xsltproc.cc xsltdialog.ui
-libxsltimport_la_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries) -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libxsltimport_la_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries) -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libxsltimport_la_LIBADD	= $(KOFFICE_LIBS) $(LIBXSLT_LIBS) $(LIBXML_LIBS)

 noinst_HEADERS = xsltimport.h xsltimportdia.h xsltproc.h
--- a/karbon/Makefile.am
+++ b/karbon/Makefile.am
@ -16,7 +16,7 @@ kde_module_LTLIBRARIES = libkarbonpart.la

 libkarboncommon_la_SOURCES = karbon_factory.cc 	karbon_resourceserver.cc 	karbon_part.cc 	karbon_part_iface.cc 	karbon_part_iface.skel 	karbon_view.cc 	karbon_view_iface.cc 	karbon_view_iface.skel karbon_drag.cpp karbon_grid_data.cpp karbon_tool_registry.cc karbon_tool_factory.cc	vtoolcontroller.cc vtool.cc

-libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) $(LIBMAGICK_LDFLAGS) -no-undefined $(LIB_QT)
+libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) $(LIBMAGICK_LDFLAGS) -no-undefined $(LIB_TQT)
 libkarboncommon_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOPALETTE) $(LIB_KOPAINTER) $(LIB_KOTEXT) \
 	dockers/libkarbondockers.la \
 	widgets/libkarbonwidgets.la \
@ -33,14 +33,14 @@ libkarboncommon_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOPALETTE)
 	$(LIBFREETYPE_LIBS)

 libkarbonpart_la_SOURCES = karbon_factory_init.cc
-libkarbonpart_la_LDFLAGS = $(KDE_PLUGIN) $(LIBFREETYPE_RPATH) $(LIB_QT)
+libkarbonpart_la_LDFLAGS = $(KDE_PLUGIN) $(LIBFREETYPE_RPATH) $(LIB_TQT)
 libkarbonpart_la_LIBADD = libkarboncommon.la

 bin_PROGRAMS =
 tdeinit_LTLIBRARIES = karbon.la
 karbon_la_SOURCES = main.cc
-karbon_la_LDFLAGS = $(all_libraries) -module -avoid-version $(LIB_QT)
-karbon_la_LIBADD = libkarboncommon.la $(LIB_QT) $(LIB_KOFFICECORE)
+karbon_la_LDFLAGS = $(all_libraries) -module -avoid-version $(LIB_TQT)
+karbon_la_LIBADD = libkarboncommon.la $(LIB_TQT) $(LIB_KOFFICECORE)

 noinst_HEADERS = \
 	karbon_factory.h \
--- a/karbon/plugins/flattenpath/Makefile.am
+++ b/karbon/plugins/flattenpath/Makefile.am
@ -6,7 +6,7 @@ karbon_flattenpathplugin_la_SOURCES = flattenpathplugin.cc
 karbon_flattenpathplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
 				$(LIB_KOPAINTER) ../../libkarboncommon.la

-karbon_flattenpathplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN)
+karbon_flattenpathplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN)

 partpluginsdir   = $(kde_datadir)/karbon/kpartplugins
 partplugins_DATA = flattenpathplugin.rc
--- a/karbon/plugins/imagetool/Makefile.am
+++ b/karbon/plugins/imagetool/Makefile.am
@ -8,7 +8,7 @@ karbon_imagetoolplugin_la_SOURCES = imagetoolplugin.cc vimagetool.cc
 karbon_imagetoolplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
 				$(LIB_KOPAINTER) ../../libkarboncommon.la

-karbon_imagetoolplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN)
+karbon_imagetoolplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN)

 METASOURCES = AUTO

--- a/karbon/plugins/insertknots/Makefile.am
+++ b/karbon/plugins/insertknots/Makefile.am
@ -6,7 +6,7 @@ karbon_insertknotsplugin_la_SOURCES = insertknotsplugin.cc
 karbon_insertknotsplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
 					$(LIB_KOPAINTER) ../../libkarboncommon.la

-karbon_insertknotsplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN)
+karbon_insertknotsplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN)

 partpluginsdir   = $(kde_datadir)/karbon/kpartplugins
 partplugins_DATA = insertknotsplugin.rc
--- a/karbon/plugins/roundcorners/Makefile.am
+++ b/karbon/plugins/roundcorners/Makefile.am
@ -6,7 +6,7 @@ karbon_roundcornersplugin_la_SOURCES = roundcornersplugin.cc
 karbon_roundcornersplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
 					$(LIB_KOPAINTER) ../../libkarboncommon.la

-karbon_roundcornersplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN)
+karbon_roundcornersplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN)

 partpluginsdir   = $(kde_datadir)/karbon/kpartplugins
 partplugins_DATA = roundcornersplugin.rc
--- a/karbon/plugins/shadoweffect/Makefile.am
+++ b/karbon/plugins/shadoweffect/Makefile.am
@ -6,7 +6,7 @@ karbon_shadoweffectplugin_la_SOURCES = shadoweffectplugin.cc vshadowdecorator.cc
 karbon_shadoweffectplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
 					$(LIB_KOPAINTER) ../../libkarboncommon.la

-karbon_shadoweffectplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN)
+karbon_shadoweffectplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN)

 partpluginsdir   = $(kde_datadir)/karbon/kpartplugins
 partplugins_DATA = shadoweffectplugin.rc
--- a/karbon/plugins/whirlpinch/Makefile.am
+++ b/karbon/plugins/whirlpinch/Makefile.am
@ -7,7 +7,7 @@ karbon_whirlpinchplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOPAINTER) $(LIB_KOFFI
 				../../libkarboncommon.la


-karbon_whirlpinchplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN)
+karbon_whirlpinchplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN)

 partpluginsdir   = $(kde_datadir)/karbon/kpartplugins
 partplugins_DATA = whirlpinchplugin.rc
--- a/karbon/plugins/zoomtool/Makefile.am
+++ b/karbon/plugins/zoomtool/Makefile.am
@ -8,7 +8,7 @@ karbon_zoomtoolplugin_la_SOURCES = vzoomtool.cc zoomtoolplugin.cc
 karbon_zoomtoolplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
 				$(LIB_KOPAINTER) ../../libkarboncommon.la

-karbon_zoomtoolplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN)
+karbon_zoomtoolplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN)

 METASOURCES = AUTO

--- a/karbon/tools/Makefile.am
+++ b/karbon/tools/Makefile.am
@ -57,7 +57,7 @@ karbon_defaulttools_la_SOURCES = \
 	vdefaulttools.cc

 karbon_defaulttools_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOPAINTER) ../libkarboncommon.la
-karbon_defaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio
+karbon_defaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio

 karbon_defaulttools_la_METASOURCES = \
 	AUTO
--- a/kchart/Makefile.am
+++ b/kchart/Makefile.am
@ -35,19 +35,19 @@ libkchartcommon_la_SOURCES = kchart_part.cc \
 libkchartcommon_la_LIBADD = $(top_builddir)/interfaces/libkochart.la \
                            $(LIB_KOFFICEUI) \
                            kdchart/libkdchart.la
-libkchartcommon_la_LDFLAGS = $(KDE_RPATH) -version-info 2:0:0 -no-undefined $(LIB_QT)
+libkchartcommon_la_LDFLAGS = $(KDE_RPATH) -version-info 2:0:0 -no-undefined $(LIB_TQT)

 ## The part
 kde_module_LTLIBRARIES = libkchartpart.la
 libkchartpart_la_SOURCES = kchart_factory_init.cc
-libkchartpart_la_LDFLAGS = $(KDE_PLUGIN) $(LIB_QT)
+libkchartpart_la_LDFLAGS = $(KDE_PLUGIN) $(LIB_TQT)
 libkchartpart_la_LIBADD = libkchartcommon.la

 ## The tdeinit loadable module and executable
 tdeinit_LTLIBRARIES = kchart.la
 bin_PROGRAMS =
 kchart_la_SOURCES = main.cc
-kchart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT)
+kchart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT)
 kchart_la_LIBADD = $(LIB_KOFFICECORE)

 noinst_HEADERS =  kchart_part.h \
--- a/kchart/kdchart/Makefile.am
+++ b/kchart/kdchart/Makefile.am
@ -39,7 +39,7 @@ libkdchart_la_SOURCES = KDChart.cpp 		\
                        #KDChartWrapperFactory.cpp

 libkdchart_la_LDFLAGS = $(all_libraries) -no-undefined
-libkdchart_la_LIBADD = $(LIB_QT) $(LIB_TDECORE)
+libkdchart_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE)

 noinst_HEADERS =	KDChart.h 		\
 			KDChartAreaPainter.h	\
--- a/kexi/Makefile.am
+++ b/kexi/Makefile.am
@ -4,7 +4,7 @@ lib_LTLIBRARIES =
 tdeinit_LTLIBRARIES = kexi.la
 bin_PROGRAMS =
 kexi_la_SOURCES = main.cpp
-kexi_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) $(LIB_QT)
+kexi_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) $(LIB_TQT)
 kexi_la_LIBADD = ./core/libkexicore.la ./main/libkeximain.la

 SUBDIRS= 3rdparty kexiutils kexidb core widget formeditor \
--- a/kexi/formeditor/factories/Makefile.am
+++ b/kexi/formeditor/factories/Makefile.am
@ -4,12 +4,12 @@ INCLUDES = -I$(top_srcdir)/kexi -I$(top_srcdir)/kexi/formeditor \
 	-I$(top_srcdir)/kexi/core \
 	-I$(top_srcdir)/lib -I$(top_srcdir)/lib/koproperty -I$(top_srcdir)/lib/kofficecore $(all_includes)
 kde_module_LTLIBRARIES = kformdesigner_containers.la kformdesigner_stdwidgets.la
-kformdesigner_containers_la_LDFLAGS =  $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+kformdesigner_containers_la_LDFLAGS =  $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 kformdesigner_containers_la_SOURCES =  containerfactory.cpp
 kformdesigner_containers_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/formeditor/libkformdesigner.la \
 	../../../lib/koproperty/libkoproperty.la

-kformdesigner_stdwidgets_la_LDFLAGS =  $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+kformdesigner_stdwidgets_la_LDFLAGS =  $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 kformdesigner_stdwidgets_la_SOURCES =  stdwidgetfactory.cpp
 kformdesigner_stdwidgets_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/formeditor/libkformdesigner.la \
 	../../../lib/koproperty/libkoproperty.la
--- a/kexi/formeditor/test/Makefile.am
+++ b/kexi/formeditor/test/Makefile.am
@ -11,7 +11,7 @@ INCLUDES = -I$(top_srcdir)/kexi -I$(top_srcdir)/kexi/formeditor \
 	-I$(top_srcdir)/kexi/widget -I$(top_srcdir)/kexi/core \
 	-I$(top_srcdir)/lib -I$(top_srcdir)/lib/kofficecore $(all_includes)

-kformdesigner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kformdesigner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

 kformdesigner_LDADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la

--- a/kexi/kexidb/Makefile.am
+++ b/kexi/kexidb/Makefile.am
@ -53,7 +53,7 @@ transaction.h \
 utils.h \
 parser/parser.h

-libkexidb_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) \
+libkexidb_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEIO) \
 	 $(top_builddir)/kexi/kexiutils/libkexiutils.la
 libkexidb_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(VER_INFO)

--- a/kexi/kexidb/drivers/mySQL/Makefile.am
+++ b/kexi/kexidb/drivers/mySQL/Makefile.am
@ -17,12 +17,12 @@ kexidb_mysqldriver_la_SOURCES = \
  mysqlpreparedstatement.cpp

 kexidb_mysqldriver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_TDEPARTS) \
-  $(LIB_QT) \
+  $(LIB_TQT) \
  $(MYSQL_LIBS) \
  -lmysqlclient \
  ../../libkexidb.la

-kexidb_mysqldriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+kexidb_mysqldriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts


 kde_services_DATA = kexidb_mysqldriver.desktop
--- a/kexi/kexidb/drivers/odbc/Makefile.am
+++ b/kexi/kexidb/drivers/odbc/Makefile.am
@ -8,7 +8,7 @@ kexidb_odbcdriver_la_METASOURCES = AUTO

 kexidb_odbcdriver_la_SOURCES = odbcdriver.cpp odbcconnection.cpp 

-kexidb_odbcdriver_la_LIBADD = $(LIB_TDEPARTS) $(LIB_QT) -lodbc $(top_builddir)/kexi/kexidb/libkexidb.la
+kexidb_odbcdriver_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TQT) -lodbc $(top_builddir)/kexi/kexidb/libkexidb.la

 kexidb_odbcdriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined

--- a/kexi/kexidb/drivers/pqxx/Makefile.am
+++ b/kexi/kexidb/drivers/pqxx/Makefile.am
@ -11,11 +11,11 @@ kexidb_pqxxsqldriver_la_METASOURCES = AUTO
 kexidb_pqxxsqldriver_la_SOURCES = pqxxdriver.cpp pqxxcursor.cpp pqxxconnection.cpp \
 	pqxxkeywords.cpp pqxxconnection_p.cpp pqxxpreparedstatement.cpp

-kexidb_pqxxsqldriver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_TDEPARTS) $(LIB_QT) -lpqxx ../../libkexidb.la
+kexidb_pqxxsqldriver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_TDEPARTS) $(LIB_TQT) -lpqxx ../../libkexidb.la

 kexidb_pqxxsqldriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) \
 	-L$(PQXX_LIBDIR) -L$(PG_LIBDIR) $(VER_INFO) -no-undefined \
-	-ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+	-ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts

 kde_services_DATA = kexidb_pqxxsqldriver.desktop

--- a/kexi/kexidb/drivers/sqlite/Makefile.am
+++ b/kexi/kexidb/drivers/sqlite/Makefile.am
@ -11,13 +11,13 @@ kexidb_sqlite3driver_la_SOURCES = sqliteconnection.cpp sqlitedriver.cpp sqlitecu
 sqlitekeywords.cpp sqlitepreparedstatement.cpp sqlitevacuum.cpp sqliteadmin.cpp \
 sqlitealter.cpp

-kexidb_sqlite3driver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_TDEPARTS) $(LIB_QT) \
+kexidb_sqlite3driver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_TDEPARTS) $(LIB_TQT) \
 $(top_builddir)/kexi/3rdparty/kexisql3/src/libkexisql3.la \
 $(top_builddir)/kexi/kexidb/libkexidb.la \
 $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la \
 ../../../../kexi/kexiutils/libkexiutils.la

-kexidb_sqlite3driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+kexidb_sqlite3driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts


 kde_services_DATA = kexidb_sqlite3driver.desktop
--- a/kexi/kexidb/drivers/sqlite2/Makefile.am
+++ b/kexi/kexidb/drivers/sqlite2/Makefile.am
@ -15,13 +15,13 @@ kexidb_sqlite2driver_la_METASOURCES = AUTO
 kexidb_sqlite2driver_la_SOURCES = sqliteconnection.cpp sqlitedriver.cpp sqlitecursor.cpp \
 	sqlitepreparedstatement.cpp sqliteadmin.cpp sqlitealter.cpp

-kexidb_sqlite2driver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_TDEPARTS) $(LIB_QT) \
+kexidb_sqlite2driver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_TDEPARTS) $(LIB_TQT) \
 $(top_builddir)/kexi/3rdparty/kexisql/src/libkexisql2.la \
 $(top_builddir)/kexi/kexidb/libkexidb.la \
 $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la \
 ../../../../kexi/kexiutils/libkexiutils.la

-kexidb_sqlite2driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+kexidb_sqlite2driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts


 kde_services_DATA = kexidb_sqlite2driver.desktop
--- a/kexi/kexiutils/Makefile.am
+++ b/kexi/kexiutils/Makefile.am
@ -14,7 +14,7 @@ libkexiutils_la_LDFLAGS = \
  $(KDE_RPATH) $(all_libraries) \
  $(VER_INFO) -Wnounresolved -no-undefined

-libkexiutils_la_LIBADD = $(LIB_QT) $(LIB_TDEUI) $(LIB_TDEIO) 
+libkexiutils_la_LIBADD = $(LIB_TQT) $(LIB_TDEUI) $(LIB_TDEIO) 

 INCLUDES = -I$(top_srcdir)/kexi $(all_includes)

--- a/kexi/migration/Makefile.am
+++ b/kexi/migration/Makefile.am
@ -31,7 +31,7 @@ libkeximigrate_la_LIBADD = \
 	$(top_builddir)/kexi/kexidb/libkexidb.la \
 	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
 	$(top_builddir)/kexi/main/libkeximain.la \
-	$(LIB_QT) $(LIB_TDECORE)
+	$(LIB_TQT) $(LIB_TDECORE)

 libkeximigrate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(VER_INFO)

@ -51,7 +51,7 @@ keximigratetest_LDADD = libkeximigrate.la \
 	$(top_builddir)/kexi/kexidb/libkexidb.la \
 	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
 	$(top_builddir)/kexi/main/libkeximain.la \
-	$(LIB_QT) $(LIB_TDECORE)
+	$(LIB_TQT) $(LIB_TDECORE)

-keximigratetest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+keximigratetest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

--- a/kexi/migration/mysql/Makefile.am
+++ b/kexi/migration/mysql/Makefile.am
@ -8,11 +8,11 @@ keximigrate_mysql_la_METASOURCES = AUTO

 keximigrate_mysql_la_SOURCES = mysqlmigrate.cpp

-keximigrate_mysql_la_LIBADD = $(KOFFICE_LIBS) $(LIB_TDEPARTS) $(LIB_QT) ../libkeximigrate.la $(MYSQL_LIBS) -lmysqlclient \
+keximigrate_mysql_la_LIBADD = $(KOFFICE_LIBS) $(LIB_TDEPARTS) $(LIB_TQT) ../libkeximigrate.la $(MYSQL_LIBS) -lmysqlclient \
 	../../../kexi/kexidb/libkexidb.la \
 	../../../kexi/kexiutils/libkexiutils.la

-keximigrate_mysql_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+keximigrate_mysql_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts

 kde_services_DATA = keximigrate_mysql.desktop

--- a/kexi/migration/pqxx/Makefile.am
+++ b/kexi/migration/pqxx/Makefile.am
@ -11,12 +11,12 @@ keximigrate_pqxx_la_METASOURCES = AUTO
 keximigrate_pqxx_la_SOURCES = pqxxmigrate.cpp

 #TODO share -libs with pqxx kexidb drv!
-#keximigrate_pqxx_la_LIBADD = $(LIB_TDEPARTS) $(LIB_QT) -lcom_err -lkrb5 -lssl -lcrypto -lcrypt -lpqxx ../libkeximigrate.la
-keximigrate_pqxx_la_LIBADD = $(KOFFICE_LIBS) $(LIB_TDEPARTS) $(LIB_QT) -lpqxx ../libkeximigrate.la \
+#keximigrate_pqxx_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TQT) -lcom_err -lkrb5 -lssl -lcrypto -lcrypt -lpqxx ../libkeximigrate.la
+keximigrate_pqxx_la_LIBADD = $(KOFFICE_LIBS) $(LIB_TDEPARTS) $(LIB_TQT) -lpqxx ../libkeximigrate.la \
 	../../../kexi/kexidb/libkexidb.la \
 	../../../kexi/kexiutils/libkexiutils.la

-keximigrate_pqxx_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -L$(PQXX_LIBDIR) -L$(PG_LIBDIR) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+keximigrate_pqxx_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -L$(PQXX_LIBDIR) -L$(PG_LIBDIR) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts

 kde_services_DATA = keximigrate_pqxx.desktop

--- a/kexi/migration/txt/Makefile.am
+++ b/kexi/migration/txt/Makefile.am
@ -8,7 +8,7 @@ keximigrate_txtmigrate_la_METASOURCES = AUTO

 keximigrate_txtmigrate_la_SOURCES = txtmigrate.cpp

-keximigrate_txtmigrate_la_LIBADD = $(LIB_TDEPARTS) $(LIB_QT) ../libkeximigrate.la
+keximigrate_txtmigrate_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TQT) ../libkeximigrate.la

 keximigrate_txtmigrate_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined

--- a/kexi/plugins/forms/Makefile.am
+++ b/kexi/plugins/forms/Makefile.am
@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kexihandler_form.la kformdesigner_kexidbwidgets.la

 kexihandler_form_la_SOURCES = kexiforms.cpp

-kexihandler_form_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+kexihandler_form_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 kexihandler_form_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/core/libkexicore.la \
 	$(top_builddir)/kexi/widget/utils/libkexiguiutils.la \
 	$(top_builddir)/kexi/widget/tableview/libkexidatatable.la \
@ -18,7 +18,7 @@ kexihandler_form_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/core/libkexico
 	../../../kexi/widget/utils/libkexiguiutils.la


-kformdesigner_kexidbwidgets_la_LDFLAGS =  $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+kformdesigner_kexidbwidgets_la_LDFLAGS =  $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 kformdesigner_kexidbwidgets_la_SOURCES = kexidbfactory.cpp
 kformdesigner_kexidbwidgets_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/formeditor/libkformdesigner.la \
 	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
@ -34,7 +34,7 @@ libkexiformutils_la_SOURCES = kexiformdataiteminterface.cpp kexidataawarewidgeti
 	kexidataprovider.cpp kexiformscrollview.cpp kexiformeventhandler.cpp \
 	kexidbtextwidgetinterface.cpp kexiactionselectiondialog.cpp kexiformmanager.cpp \
 	kexidatasourcepage.cpp kexiformpart.cpp kexiformview.cpp
-libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkexiformutils_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/core/libkexicore.la \
 	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
 	$(top_builddir)/kexi/formeditor/libkformdesigner.la \
--- a/kexi/plugins/importexport/csv/Makefile.am
+++ b/kexi/plugins/importexport/csv/Makefile.am
@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kexihandler_csv_importexport.la
 kexihandler_csv_importexport_la_SOURCES = kexicsv_importexportpart.cpp kexicsvimportdialog.cpp \
 	kexicsvimportoptionsdlg.cpp kexicsvwidgets.cpp kexicsvexport.cpp kexicsvexportwizard.cpp

-kexihandler_csv_importexport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+kexihandler_csv_importexport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 kexihandler_csv_importexport_la_LIBADD = $(KOFFICE_LIBS) ../../../core/libkexicore.la \
 	../../../migration/libkeximigrate.la \
 	../../../../kexi/kexidb/libkexidb.la \
--- a/kexi/plugins/macros/kexiactions/Makefile.am
+++ b/kexi/plugins/macros/kexiactions/Makefile.am
@ -16,7 +16,7 @@ libkeximacroactions_la_LDFLAGS = $(all_libraries)
 libkeximacroactions_la_LIBADD = \
    $(top_builddir)/kexi/plugins/macros/lib/libkomacro.la \
    $(top_builddir)/kexi/core/libkexicore.la \
-    $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
+    $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI)

 libkeximacroactions_la_METASOURCES = AUTO
 SUBDIRS = .
--- a/kexi/plugins/macros/lib/Makefile.am
+++ b/kexi/plugins/macros/lib/Makefile.am
@ -16,7 +16,7 @@ libkomacro_la_SOURCES = \
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)

 libkomacro_la_LDFLAGS = $(all_libraries) -Wnounresolved
-libkomacro_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
+libkomacro_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI)

 libkomacro_la_METASOURCES = AUTO
 SUBDIRS = .
--- a/kexi/plugins/macros/tests/Makefile.am
+++ b/kexi/plugins/macros/tests/Makefile.am
@ -7,12 +7,12 @@ endif
 bin_PROGRAMS = komacrotest $(GUIBINPROGRAM)

 komacrotest_SOURCES = komacrotest.cpp testobject.cpp testaction.cpp actiontests.cpp macrotests.cpp macroitemtests.cpp variabletests.cpp xmlhandlertests.cpp xmlhandlertests2.cpp
-komacrotest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+komacrotest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 komacrotest_LDADD = -ltdeunittest ../lib/libkomacro.la $(LIB_TDEUI) $(LIB_TDEPARTS)

 if include_tdeunittestgui
  komacrotestgui_SOURCES = komacrotestgui.cpp testobject.cpp testaction.cpp actiontests.cpp macrotests.cpp macroitemtests.cpp variabletests.cpp xmlhandlertests.cpp xmlhandlertests2.cpp
-  komacrotestgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+  komacrotestgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
  komacrotestgui_LDADD = -ltdeunittestgui ../lib/libkomacro.la $(LIB_TDEUI) $(LIB_TDEPARTS)
 endif

--- a/kexi/plugins/migration/Makefile.am
+++ b/kexi/plugins/migration/Makefile.am
@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kexihandler_migration.la

 kexihandler_migration_la_SOURCES = keximigrationpart.cpp

-kexihandler_migration_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+kexihandler_migration_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 kexihandler_migration_la_LIBADD = $(KOFFICE_LIBS) ../../core/libkexicore.la \
 	../../migration/libkeximigrate.la \
 	../../../kexi/kexidb/libkexidb.la \
--- a/kexi/plugins/queries/Makefile.am
+++ b/kexi/plugins/queries/Makefile.am
@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kexihandler_query.la
 kexihandler_query_la_SOURCES = kexiquerypart.cpp kexiquerydesignersql.cpp \
 				kexiquerydesignersqlhistory.cpp kexiquerydesignerguieditor.cpp \
 				kexiqueryview.cpp
-kexihandler_query_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+kexihandler_query_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 kexihandler_query_la_LIBADD = $(KOFFICE_LIBS) ../../core/libkexicore.la \
  $(top_builddir)/kexi/kexidb/libkexidb.la \
  $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
--- a/kexi/plugins/relations/Makefile.am
+++ b/kexi/plugins/relations/Makefile.am
@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kexihandler_relation.la
 kexihandler_relation_la_SOURCES = kexirelationpartimpl.cpp \
 				kexirelationmaindlg.cpp

-kexihandler_relation_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+kexihandler_relation_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 kexihandler_relation_la_LIBADD = $(KOFFICE_LIBS) ../../core/libkexicore.la \
 	../../widget/relations/libkexirelationsview.la \
 	../../../kexi/kexidb/libkexidb.la \
--- a/kexi/plugins/scripting/kexiapp/Makefile.am
+++ b/kexi/plugins/scripting/kexiapp/Makefile.am
@ -11,7 +11,7 @@ krosskexiapp_la_SOURCES = \

 krosskexiapp_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module
 krosskexiapp_la_LIBADD = \
-    $(LIB_QT) \
+    $(LIB_TQT) \
    $(LIB_TDECORE) \
    $(LIB_KROSS_API) \
    $(LIB_KROSS_MAIN) \
--- a/kexi/plugins/scripting/kexidb/Makefile.am
+++ b/kexi/plugins/scripting/kexidb/Makefile.am
@ -19,7 +19,7 @@ krosskexidb_la_SOURCES = \

 krosskexidb_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdeio
 krosskexidb_la_LIBADD = \
-    $(LIB_QT) \
+    $(LIB_TQT) \
    $(LIB_TDECORE) \
    $(LIB_KROSS_API) \
    $(LIB_KROSS_MAIN) \
--- a/kexi/plugins/scripting/kexiscripting/Makefile.am
+++ b/kexi/plugins/scripting/kexiscripting/Makefile.am
@ -7,7 +7,7 @@ kexihandler_script_la_SOURCES = \

 kexihandler_script_la_LDFLAGS = \
    $(KDE_PLUGIN) -module -no-undefined -Wnounresolved $(all_libraries) $(VER_INFO) \
-    -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+    -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts

 kexihandler_script_la_LIBADD = $(KOFFICE_LIBS) \
    $(top_builddir)/lib/kross/main/libkrossmain.la \
--- a/kexi/plugins/tables/Makefile.am
+++ b/kexi/plugins/tables/Makefile.am
@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kexihandler_table.la
 kexihandler_table_la_SOURCES = kexitablepart.cpp kexitabledesignerview.cpp kexitabledesignerview_p.cpp \
 	kexitabledesigner_dataview.cpp kexitabledesignercommands.cpp kexilookupcolumnpage.cpp

-kexihandler_table_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -ltdemdi
+kexihandler_table_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts -ltdemdi
 kexihandler_table_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/core/libkexicore.la \
 	$(top_builddir)/kexi/kexidb/libkexidb.la \
 	$(top_builddir)/kexi/widget/tableview/libkexidatatable.la \
--- a/kexi/tests/altertable/Makefile.am
+++ b/kexi/tests/altertable/Makefile.am
@ -13,10 +13,10 @@ SUBDIRS = .
 METASOURCES = AUTO

 kexialtertabletest_SOURCES = altertable.cpp
-kexialtertabletest_LDADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \
+kexialtertabletest_LDADD = $(LIB_TQT) $(LIB_TDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \
 $(top_builddir)/kexi/kexiutils/libkexiutils.la \
 $(top_builddir)/kexi/main/libkeximain.la \
 $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la \
 $(top_builddir)/kexi/widget/libkexiextendedwidgets.la
-kexialtertabletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kexialtertabletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

--- a/kexi/tests/newapi/Makefile.am
+++ b/kexi/tests/newapi/Makefile.am
@ -16,18 +16,18 @@ SUBDIRS = .
 METASOURCES = AUTO

 kexidbtest_SOURCES = main.cpp
-kexidbtest_LDADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \
+kexidbtest_LDADD = $(LIB_TQT) $(LIB_TDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \
 ../../kexidb/parser/libkexidbparser.la \
 $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
 ../../widget/tableview/libkexidatatable.la
-kexidbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kexidbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

 #kexidbmysqlcursor_SOURCES = mysqlcursor.cpp
-#kexidbmysqlcursor_LDADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \
+#kexidbmysqlcursor_LDADD = $(LIB_TQT) $(LIB_TDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \
 # ../../kexidb/parser/libkexidbparser.la
-#kexidbmysqlcursor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+#kexidbmysqlcursor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

 #kexidbfirebirdcursor_SOURCES = firebirdcursor.cpp
-#kexidbfirebirdcursor_LDADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la
-#kexidbfirebirdcursor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+#kexidbfirebirdcursor_LDADD = $(LIB_TQT) $(LIB_TDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la
+#kexidbfirebirdcursor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

--- a/kexi/tests/parser/Makefile.am
+++ b/kexi/tests/parser/Makefile.am
@ -7,7 +7,7 @@ noinst_PROGRAMS = kexidbparser
 INCLUDES = -I$(top_srcdir)/kexi $(all_includes)

 kexidbparser_SOURCES = main.cpp
-kexidbparser_LDADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la  $(all_libraries)
+kexidbparser_LDADD = $(LIB_TQT) $(LIB_TDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la  $(all_libraries)
 kexidbparser_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(VER_INFO) --no-undefined


--- a/kexi/tests/startup/Makefile.am
+++ b/kexi/tests/startup/Makefile.am
@ -11,7 +11,7 @@ SUBDIRS = .
 METASOURCES = AUTO

 kexistartuptest_SOURCES = main.cpp
-kexistartuptest_LDADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \
+kexistartuptest_LDADD = $(LIB_TQT) $(LIB_TDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \
 $(top_builddir)/kexi/core/libkexicore.la \
 $(all_libraries)

--- a/kexi/tests/tableview/Makefile.am
+++ b/kexi/tests/tableview/Makefile.am
@ -11,6 +11,6 @@ SUBDIRS = .
 METASOURCES = AUTO

 kexitableviewtest_SOURCES = main.cpp
-kexitableviewtest_LDADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la $(top_builddir)/kexi/widget/libkexiextendedwidgets.la $(all_libraries)
+kexitableviewtest_LDADD = $(LIB_TQT) $(LIB_TDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la $(top_builddir)/kexi/widget/libkexiextendedwidgets.la $(all_libraries)
 kexitableviewtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(VER_INFO) --no-undefined

--- a/kexi/tests/widgets/Makefile.am
+++ b/kexi/tests/widgets/Makefile.am
@ -5,10 +5,10 @@ noinst_PROGRAMS = kexidbdrivercombotest
 INCLUDES = -I$(top_srcdir)/kexi $(all_includes)

 kexidbdrivercombotest_SOURCES = kexidbdrivercombotest.cpp
-kexidbdrivercombotest_LDADD = $(LIB_QT) $(LIB_TDECORE) \
+kexidbdrivercombotest_LDADD = $(LIB_TQT) $(LIB_TDECORE) \
 $(top_builddir)/kexi/kexidb/libkexidb.la \
 $(top_builddir)/kexi/widget/libkexiextendedwidgets.la
-kexidbdrivercombotest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kexidbdrivercombotest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

 METASOURCES = AUTO

--- a/kformula/Makefile.am
+++ b/kformula/Makefile.am
@ -6,14 +6,14 @@ kde_module_LTLIBRARIES = libkformulapart.la
 libkformulapart_la_SOURCES = kformula_doc.cc \
 	kformula_view.cc kformula_factory.cc kformulawidget.cc kfconfig.cc \
 	kformula_view_iface.skel kformula_view_iface.cc formulastring.cc fsparser.cc
-libkformulapart_la_LDFLAGS = $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio $(KDE_PLUGIN) -lDCOP -ltdeparts
+libkformulapart_la_LDFLAGS = $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio $(KDE_PLUGIN) -lDCOP -ltdeparts
 libkformulapart_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KFORMULA) $(LIB_KOTEXT)
 libkformulapart_la_METASOURCES = AUTO

 ## The tdeinit loadable module
 tdeinit_LTLIBRARIES = kformula.la
 kformula_la_SOURCES = main.cc
-kformula_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT)
+kformula_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT)
 kformula_la_LIBADD = $(LIB_KOFFICECORE)

 bin_PROGRAMS =
--- a/kivio/plugins/kivioconnectortool/Makefile.am
+++ b/kivio/plugins/kivioconnectortool/Makefile.am
@ -25,7 +25,7 @@ EXTRA_DIST = \
 		kivio_connector_cursor2.xpm\
 		kivio_connector_cursor1.xpm

-libkivioconnectortool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkivioconnectortool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkivioconnectortool_la_LIBADD = $(LIB_KOPAINTER) $(LIB_KOFFICEUI) $(top_builddir)/kivio/kiviopart/libkiviocommon.la

 rc_DATA = kivioconnectortool.rc
--- a/kivio/plugins/kivioconnectortool/straight_connector/Makefile.am
+++ b/kivio/plugins/kivioconnectortool/straight_connector/Makefile.am
@ -3,7 +3,7 @@ stencil_DATA = straight_connector.xpm

 kde_module_LTLIBRARIES =straight_connector.la

-straight_connector_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio
+straight_connector_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio

 # Hack to make it work (dave m)
 straight_connector_la_LIBADD = $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la
--- a/kivio/plugins/kivioselecttool/Makefile.am
+++ b/kivio/plugins/kivioselecttool/Makefile.am
@ -19,7 +19,7 @@ EXTRA_DIST = \
 		tool_select.cpp\
 		tool_select.h\
 		kivioselecttool.rc
-libkivioselecttool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkivioselecttool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkivioselecttool_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOTEXT) $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la

 rc_DATA = kivioselecttool.rc
--- a/kivio/plugins/kiviotargettool/Makefile.am
+++ b/kivio/plugins/kiviotargettool/Makefile.am
@ -8,7 +8,7 @@ INCLUDES = -I$(top_srcdir)/kivio/kiviopart/config \
 METASOURCES = AUTO

 kde_module_LTLIBRARIES =  libkiviotargettool.la
-libkiviotargettool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkiviotargettool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkiviotargettool_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOTEXT) $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la
 libkiviotargettool_la_SOURCES = kiviotargettool.cpp kiviotargettoolfactory.cpp

--- a/kivio/plugins/kiviotexttool/Makefile.am
+++ b/kivio/plugins/kiviotexttool/Makefile.am
@ -22,7 +22,7 @@ EXTRA_DIST = \
 		kivio_text_cursor.xpm\
 		Text.sml\
 		Text.xpm
-libkiviotexttool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkiviotexttool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkiviotexttool_la_LIBADD =$(LIB_KOTEXT) $(LIB_KOPAINTER) $(LIB_KOFFICEUI) $(top_builddir)/kivio/kiviopart/libkiviocommon.la

 rc_DATA = kiviotexttool.rc
--- a/kivio/plugins/kiviozoomtool/Makefile.am
+++ b/kivio/plugins/kiviozoomtool/Makefile.am
@ -18,7 +18,7 @@ EXTRA_DIST = \
 		kiviozoomtool.rc\
 		tool_zoom.cpp\
 		tool_zoom.h
-libkiviozoomtool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkiviozoomtool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkiviozoomtool_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOTEXT) $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la

 rc_DATA = kiviozoomtool.rc
--- a/koshell/Makefile.am
+++ b/koshell/Makefile.am
@ -6,7 +6,7 @@ lib_LTLIBRARIES =
 tdeinit_LTLIBRARIES = koshell.la
 bin_PROGRAMS =
 koshell_la_SOURCES = koshell_main.cc koshell_shell.cc iconsidepane.cpp koshellsettings.kcfgc
-koshell_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT)
+koshell_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT)
 koshell_la_LIBADD = $(LIB_KOFFICEUI)
 kde_kcfg_DATA = koshell.kcfg

--- a/kounavail/Makefile.am
+++ b/kounavail/Makefile.am
@ -3,7 +3,7 @@ INCLUDES  = $(KOFFICE_INCLUDES) $(all_includes)
 ## The part
 kde_module_LTLIBRARIES = libkounavailpart.la
 libkounavailpart_la_SOURCES = kounavail.cc
-libkounavailpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkounavailpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkounavailpart_la_LIBADD = $(LIB_KOFFICECORE)

 METASOURCES = AUTO
--- a/kplato/Makefile.am
+++ b/kplato/Makefile.am
@ -102,7 +102,7 @@ noinst_HEADERS = \
 ## The part
 lib_LTLIBRARIES = 
 kde_module_LTLIBRARIES = libkplatopart.la
-libkplatopart_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -ltdeprint
+libkplatopart_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts -ltdeprint
 libkplatopart_la_LIBADD = $(LIB_TDEABC) $(KOFFICE_LIBS) -lDCOP \
                          $(top_builddir)/kdgantt/libkdgantt.la
 ##                          $(top_builddir)/kugar/lib/libkugarlib.la
@ -113,7 +113,7 @@ libkplatopart_la_METASOURCES = AUTO
 tdeinit_LTLIBRARIES = kplato.la
 bin_PROGRAMS =
 kplato_la_SOURCES = main.cc
-kplato_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -ltdeprint
+kplato_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts -ltdeprint
 kplato_la_LIBADD = $(KOFFICE_LIBS)

 xdg_apps_DATA = kplato.desktop
--- a/kpresenter/Makefile.am
+++ b/kpresenter/Makefile.am
@ -68,7 +68,7 @@ libkpresenterprivate_la_SOURCES = KoPointArray.cpp KPrCanvas.cpp \
 	slidetransitionwidget.ui KPrSlideTransitionDia.cpp \
 	KPrPrinterDlg.cpp

-libkpresenterprivate_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts $(LIBKSPELL2)
+libkpresenterprivate_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts $(LIBKSPELL2)
 if include_ARTS
 ARTSKDE = -lartskde
 endif
@ -77,14 +77,14 @@ libkpresenterprivate_la_LIBADD = autoformEdit/libaf.la $(LIB_KOFFICEUI) $(LIB_KO
 ## The part
 kde_module_LTLIBRARIES = libkpresenterpart.la
 libkpresenterpart_la_SOURCES = KPrFactoryInit.cpp
-libkpresenterpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkpresenterpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkpresenterpart_la_LIBADD = libkpresenterprivate.la

 ## The tdeinit loadable module and the executable
 tdeinit_LTLIBRARIES = kpresenter.la
 bin_PROGRAMS =
 kpresenter_la_SOURCES = main.cpp
-kpresenter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+kpresenter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 kpresenter_la_LIBADD = $(LIB_KOFFICECORE)

 METASOURCES = AUTO
--- a/kspread/Makefile.am
+++ b/kspread/Makefile.am
@ -28,12 +28,12 @@ libkspreadcommon_la_SOURCES = digest.cc commands.cc damages.cc dependencies.cc \
 		kspread_genvalidationstyle.cc region.cc selection.cc manipulator.cc manipulator_data.cc \
 	kspread_generalProperty.cpp kspread_propertyEditor.cpp 

-libkspreadcommon_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -ltdeutils
+libkspreadcommon_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts -ltdeutils
 libkspreadcommon_la_LIBADD = $(top_builddir)/interfaces/libkochart.la \
 	dialogs/libdialogs.la tests/libtests.la \
 	$(LIB_KOFFICEUI) $(LIB_KOTEXT) -ltdespell

-libkspreadpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkspreadpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkspreadpart_la_LIBADD  = libkspreadcommon.la
 libkspreadpart_la_SOURCES = kspread_factory_init.cc

@ -44,7 +44,7 @@ METASOURCES = AUTO
 tdeinit_LTLIBRARIES = kspread.la
 bin_PROGRAMS =
 kspread_la_SOURCES = main.cc
-kspread_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+kspread_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 kspread_la_LIBADD = $(LIB_KOFFICECORE)

 xdg_apps_DATA = kspread.desktop
--- a/kspread/plugins/scripting/Makefile.am
+++ b/kspread/plugins/scripting/Makefile.am
@ -14,7 +14,7 @@ noinst_HEADERS = scripting.h

 kspreadscripting_la_METASOURCES = AUTO

-kspreadscripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+kspreadscripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 kspreadscripting_la_LIBADD = $(top_builddir)/kspread/libkspreadcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la

 kde_services_DATA = kspreadscripting.desktop
--- a/kspread/plugins/scripting/kspreadcore/CMakeLists.txt
+++ b/kspread/plugins/scripting/kspreadcore/CMakeLists.txt
@ -42,7 +42,7 @@ install(TARGETS krosskspreadcore  DESTINATION ${PLUGIN_INSTALL_DIR})
 #
 #krosskspreadcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 #krosskspreadcore_la_LIBADD = \
-#    $(LIB_QT) \
+#    $(LIB_TQT) \
 #    $(LIB_TDECORE) \
 #    $(top_builddir)/lib/kross/api/libkrossapi.la \
 #    $(top_builddir)/lib/kross/main/libkrossmain.la \
--- a/kspread/plugins/scripting/kspreadcore/Makefile.am
+++ b/kspread/plugins/scripting/kspreadcore/Makefile.am
@ -7,10 +7,10 @@ kde_module_LTLIBRARIES = krosskspreadcore.la

 krosskspreadcore_la_SOURCES = kspreadcoremodule.cpp krs_doc.cpp krs_sheet.cpp krs_cell.cpp

-krosskspreadcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+krosskspreadcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 krosskspreadcore_la_LIBADD = \
    $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
-    $(LIB_QT) \
+    $(LIB_TQT) \
    $(LIB_TDECORE) \
    $(top_builddir)/lib/kross/api/libkrossapi.la \
    $(top_builddir)/lib/kross/main/libkrossmain.la \
--- a/kugar/kudesigner/Makefile.am
+++ b/kugar/kudesigner/Makefile.am
@ -8,19 +8,19 @@ bin_PROGRAMS =
 lib_LTLIBRARIES = libkudesignercore.la
 libkudesignercore_la_SOURCES = kudesigner_view.cpp kudesigner_factory.cpp \
 	kudesigner_doc.cpp
-libkudesignercore_la_LDFLAGS = -avoid-version $(all_libraries) $(KDE_RPATH) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkudesignercore_la_LDFLAGS = -avoid-version $(all_libraries) $(KDE_RPATH) -no-undefined -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkudesignercore_la_LIBADD = ../kudesigner_lib/libkudesignercommon.la $(LIB_KOFFICEUI) $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOPROPERTY) $(LIB_TDEIO) $(LIB_TDEPRINT)

 ## The part
 kde_module_LTLIBRARIES = libkudesignerpart.la
 libkudesignerpart_la_SOURCES = kudesigner_part.cpp
-libkudesignerpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(KDE_RPATH) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkudesignerpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(KDE_RPATH) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkudesignerpart_la_LIBADD = libkudesignercore.la $(LIB_KOFFICEUI) $(LIB_TDEPARTS) $(LIB_KOFFICECORE)

 ## The tdeinit loadable module
 tdeinit_LTLIBRARIES = kudesigner.la
 kudesigner_la_SOURCES = main.cpp
-kudesigner_la_LDFLAGS = $(all_libraries) -module -avoid-version -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+kudesigner_la_LDFLAGS = $(all_libraries) -module -avoid-version -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 kudesigner_la_LIBADD = $(LIB_KOFFICECORE)

 xdg_apps_DATA = kudesigner.desktop
--- a/kugar/lib/Makefile.am
+++ b/kugar/lib/Makefile.am
@ -2,7 +2,7 @@ INCLUDES = $(KOFFICE_INCLUDES) $(all_includes)

 METASOURCES = AUTO

-libkugarlib_la_LIBADD = $(LIB_QT) $(LIB_TDEPRINT)
+libkugarlib_la_LIBADD = $(LIB_TQT) $(LIB_TDEPRINT)

 libkugarlib_la_LDFLAGS = $(all_libraries) -version-info 1:2 -no-undefined

--- a/kugar/part/Makefile.am
+++ b/kugar/part/Makefile.am
@ -29,7 +29,7 @@ CLEANFILES = kugarpart_meta_unload.cpp
 tdeinit_LTLIBRARIES = kugar.la
 bin_PROGRAMS =
 kugar_la_SOURCES = main.cpp
-kugar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT)
+kugar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT)
 kugar_la_LIBADD = $(LIB_KOFFICECORE)

 kde_services_DATA = kugarpart.desktop
--- a/kword/Makefile.am
+++ b/kword/Makefile.am
@ -9,7 +9,7 @@ lib_LTLIBRARIES = libkwmailmerge_interface.la libkwordprivate.la

 ## The part
 libkwordpart_la_SOURCES = KWFactoryInit.cpp
-libkwordpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkwordpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkwordpart_la_LIBADD = $(KOFFICE_LIBS) libkwordprivate.la

 ## A lib with all the code
@ -54,15 +54,15 @@ libkwordprivate_la_SOURCES = KWTableFrameSet.cpp KWCanvas.cpp KWFrame.cpp KWForm
 		KWLoadingInfo.cpp


-libkwordprivate_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts $(LIBKSPELL2)
+libkwordprivate_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts $(LIBKSPELL2)
 libkwordprivate_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KOTEXT) ../lib/kformula/libkformulalib.la ./libkwmailmerge_interface.la 

 METASOURCES = AUTO

 ## The mailmerge interface library
 libkwmailmerge_interface_la_SOURCES = KWMailMergeDataSource.cpp KWMailMergeDataSource.skel
-libkwmailmerge_interface_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
-libkwmailmerge_interface_la_LIBADD = $(KOFFICE_LIBS) $(LIB_QT) -lDCOP
+libkwmailmerge_interface_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
+libkwmailmerge_interface_la_LIBADD = $(KOFFICE_LIBS) $(LIB_TQT) -lDCOP
 twincludedir = $(includedir)/kword
 twinclude_HEADERS = KWMailMergeDataSource.h

@ -73,7 +73,7 @@ kwmailmerge_servicetypedir=$(kde_servicetypesdir)
 tdeinit_LTLIBRARIES = kword.la
 bin_PROGRAMS =
 kword_la_SOURCES = main.cpp
-kword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+kword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 kword_la_LIBADD = $(KOFFICE_LIBS)

 xdg_apps_DATA = kword.desktop
--- a/kword/mailmerge/Makefile.am
+++ b/kword/mailmerge/Makefile.am
@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kwmailmerge_classic.la

 ## Plugin encapsulating the (old) internally stored style
 kwmailmerge_classic_la_SOURCES = KWClassicSerialDataSource.cpp
-kwmailmerge_classic_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+kwmailmerge_classic_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 kwmailmerge_classic_la_LIBADD = $(KOFFICE_LIBS) ../libkwmailmerge_interface.la $(LIB_TDEUI) $(LIB_KOTEXT)

 METASOURCES = AUTO
--- a/kword/mailmerge/kspread/Makefile.am
+++ b/kword/mailmerge/kspread/Makefile.am
@ -6,7 +6,7 @@ INCLUDES = $(KOFFICE_INCLUDES) $(KOTEXT_INCLUDES)  \
 kde_module_LTLIBRARIES = kwmailmerge_kspread.la

 kwmailmerge_kspread_la_SOURCES = kwmailmerge_kspread.cpp kwmailmerge_kspread_config.cpp
-kwmailmerge_kspread_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+kwmailmerge_kspread_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 kwmailmerge_kspread_la_LIBADD = $(KOFFICE_LIBS) ../../libkwmailmerge_interface.la \
                                $(top_builddir)/kspread/libkspreadcommon.la $(LIB_TDEUI)

--- a/kword/mailmerge/sql/Makefile.am
+++ b/kword/mailmerge/sql/Makefile.am
@ -6,13 +6,13 @@ kde_module_LTLIBRARIES = kwmailmerge_qtsqldb.la kwmailmerge_qtsqldb_power.la
 ## Plugin encapsulating the QT SQL database interface
 kwmailmerge_qtsqldb_la_SOURCES = KWQtSqlSerialDataSource.cpp qtsqldatasourceeditor.ui \
 				 KWQtSqlEasyFilter.cpp
-kwmailmerge_qtsqldb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+kwmailmerge_qtsqldb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 kwmailmerge_qtsqldb_la_LIBADD = $(KOFFICE_LIBS) libmailmergesqlcommon.la ../../libkwmailmerge_interface.la $(LIB_TDEUI)
 kwmailmerge_qtsqldb_la_COMPILE_FIRST = qtsqlopenwidget.h

 ## 2. Plugin encapsulating the QT SQL database interface
 kwmailmerge_qtsqldb_power_la_SOURCES = KWQtSqlPowerSerialDataSource.cpp kwqtsqlpower.ui KWQtSqlPowerSerialDataSource.skel
-kwmailmerge_qtsqldb_power_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+kwmailmerge_qtsqldb_power_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 kwmailmerge_qtsqldb_power_la_LIBADD = $(KOFFICE_LIBS) libmailmergesqlcommon.la ../../libkwmailmerge_interface.la $(LIB_TDEUI)
 kwmailmerge_qtsqldb_power_la_COMPILE_FIRST = qtsqlopenwidget.h

--- a/kword/mailmerge/tdeabc/Makefile.am
+++ b/kword/mailmerge/tdeabc/Makefile.am
@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = kwmailmerge_tdeabc.la

 ## Plugin encapsulating the QT SQL database interface
 kwmailmerge_tdeabc_la_SOURCES = KWMailMergeTDEABC.cpp KWMailMergeTDEABCConfig.cpp addresspicker.ui
-kwmailmerge_tdeabc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+kwmailmerge_tdeabc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 kwmailmerge_tdeabc_la_LIBADD = $(KOFFICE_LIBS) ../../libkwmailmerge_interface.la $(LIB_TDEUI) $(LIB_TDEABC)

 METASOURCES = AUTO
--- a/lib/kofficecore/Makefile.am
+++ b/lib/kofficecore/Makefile.am
@ -34,7 +34,7 @@ libkofficecore_la_SOURCES = KoDocument.cpp \
 	KoSpeaker.cpp KoOasisLoadingContext.cpp \
 	KoRect.cpp

-libkofficecore_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio
+libkofficecore_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 -no-undefined -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio

 include_HEADERS = KoContainerHandler.h \
 	KoFilter.h KoFilterChain.h \
@ -59,7 +59,7 @@ noinst_HEADERS = KoDocument_p.h KoFilterManager_p.h \

 kodocinfopropspage_la_SOURCES = KoDocInfoPropsFactory.cpp
 kodocinfopropspage_la_LIBADD = ./libkofficecore.la
-kodocinfopropspage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -lkofficecore
+kodocinfopropspage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -lkofficecore

 METASOURCES = AUTO

--- a/lib/koproperty/Makefile.am
+++ b/lib/koproperty/Makefile.am
@ -2,7 +2,7 @@ INCLUDES = -I$(srcdir)/editors -I$(top_srcdir)/lib/kofficecore $(all_includes)

 lib_LTLIBRARIES =  libkoproperty.la

-libkoproperty_la_LIBADD = $(LIB_TDEUI) ./editors/libkopropertyeditors.la $(LIB_QT) $(LIB_TDECORE)
+libkoproperty_la_LIBADD = $(LIB_TDEUI) ./editors/libkopropertyeditors.la $(LIB_TQT) $(LIB_TDECORE)
 libkoproperty_la_LDFLAGS = -no-undefined $(all_libraries) -version-info 2:0:0
 libkoproperty_la_SOURCES = property.cpp customproperty.cpp set.cpp editor.cpp \
 	editoritem.cpp factory.cpp widget.cpp
--- a/lib/koproperty/test/Makefile.am
+++ b/lib/koproperty/test/Makefile.am
@ -6,7 +6,7 @@ METASOURCES = AUTO
 noinst_PROGRAMS = propertytest

 propertytest_SOURCES = main.cpp test.cpp
-propertytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+propertytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 propertytest_LDADD = $(LIB_KOPROPERTY)

 # this is where the shell's XML-GUI resource file goes
--- a/lib/kotext/kohyphen/Makefile.am
+++ b/lib/kotext/kohyphen/Makefile.am
@ -17,5 +17,5 @@ SUBDIRS = . hyphdicts
 check_PROGRAMS = kohyphentest

 kohyphentest_SOURCES = kohyphentest.cpp
-kohyphentest_LDADD = ./libkohyphen.la $(LIB_QT) $(LIB_TDECORE)
-kohyphentest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kohyphentest_LDADD = ./libkohyphen.la $(LIB_TQT) $(LIB_TDECORE)
+kohyphentest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
--- a/lib/kotext/tests/Makefile.am
+++ b/lib/kotext/tests/Makefile.am
@ -8,7 +8,7 @@ check_PROGRAMS = kotextformattertest kobordertest kovariabletest
 TESTS = kotextformattertest kovariabletest

 LDADD = ../libkotext.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

 kobordertest_SOURCES = kobordertest.cpp
 kotextformattertest_SOURCES = kotextformattertest.cpp
--- a/lib/kross/api/Makefile.am
+++ b/lib/kross/api/Makefile.am
@ -42,7 +42,7 @@ libkrossapi_la_SOURCES = \
    interpreter.cpp

 libkrossapi_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved
-libkrossapi_la_LIBADD = $(LIB_QT) $(LIB_TDECORE)
+libkrossapi_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE)

 METASOURCES = AUTO
 SUBDIRS = .
--- a/lib/kross/main/Makefile.am
+++ b/lib/kross/main/Makefile.am
@ -22,7 +22,7 @@ maininclude_HEADERS = \
    wdgscriptsmanagerbase.h 

 libkrossmain_la_LIBADD = \
-    $(LIB_QT) \
+    $(LIB_TQT) \
    $(LIB_TDECORE) \
    $(LIB_TDEFILE) \
    $(LIB_TDEUI) \
--- a/lib/kross/python/Makefile.am
+++ b/lib/kross/python/Makefile.am
@ -24,7 +24,7 @@ krosspython_la_SOURCES = \
    pythoninterpreter.cpp

 krosspython_la_LIBADD = \
-    $(LIB_QT) \
+    $(LIB_TQT) \
    $(LIB_TDECORE) \
    cxx/libkrosspythoncxx.la \
    ../api/libkrossapi.la \
--- a/lib/kross/ruby/Makefile.am
+++ b/lib/kross/ruby/Makefile.am
@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = krossruby.la
 krossruby_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(RUBY_LIBRUBYARG) -module $(VER_INFO)

 krossruby_la_LIBADD = \
-    $(LIB_QT) \
+    $(LIB_TQT) \
    $(LIB_TDECORE) \
    ../api/libkrossapi.la \
    ../main/libkrossmain.la
--- a/lib/kross/runner/Makefile.am
+++ b/lib/kross/runner/Makefile.am
@ -4,8 +4,8 @@ include $(top_srcdir)/lib/kross/Makefile.global
 bin_PROGRAMS = krossrunner

 krossrunner_SOURCES = main.cpp
-krossrunner_LDADD = $(LIB_QT) $(LIB_TDECORE) ../api/libkrossapi.la ../main/libkrossmain.la
+krossrunner_LDADD = $(LIB_TQT) $(LIB_TDECORE) ../api/libkrossapi.la ../main/libkrossmain.la
 INCLUDES = $(KROSS_INCLUDES) $(all_includes)
-krossrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+krossrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 SUBDIRS = .
 METASOURCES = AUTO
--- a/lib/kross/test/Makefile.am
+++ b/lib/kross/test/Makefile.am
@ -5,13 +5,13 @@ noinst_PROGRAMS = krosstest
 krosstest_SOURCES = testobject.cpp testaction.cpp testplugin.cpp testwindow.cpp main.cpp

 krosstest_LDADD = \
-    $(LIB_QT) \
+    $(LIB_TQT) \
    $(LIB_TDECORE) \
    $(LIB_TDEUI) \
    ../api/libkrossapi.la \
    ../main/libkrossmain.la

 INCLUDES = $(KROSS_INCLUDES) $(all_includes)
-krosstest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+krosstest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 SUBDIRS = .
 METASOURCES = AUTO
--- a/lib/kwmf/Makefile.am
+++ b/lib/kwmf/Makefile.am
@ -3,7 +3,7 @@
 INCLUDES= $(KOFFICECORE_INCLUDES) -I$(srcdir) $(all_includes)
 libkwmf_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 -no-undefined
 # We use tdecore for kdDebug :)
-libkwmf_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
+libkwmf_la_LIBADD = $(LIB_TDECORE) $(LIB_TQT)

 ####### Files

@ -16,4 +16,4 @@ noinst_HEADERS = kwmf.h qwmf.h metafuncs.h wmfstruct.h kowmfreadprivate.h kowmfs

 libkowmf_la_SOURCES  = kowmfreadprivate.cc kowmfstack.cc kowmfread.cc kowmfwrite.cc kowmfpaint.cc
 libkowmf_la_LDFLAGS = $(all_libraries) -version-info 2:0:0  -no-undefined
-libkowmf_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
+libkowmf_la_LIBADD = $(LIB_TDECORE) $(LIB_TQT)
--- a/lib/store/Makefile.am
+++ b/lib/store/Makefile.am
@ -7,7 +7,7 @@ INCLUDES = $(KOFFICECORE_INCLUDES) $(all_includes)

 ####### Files

-libkstore_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
+libkstore_la_LIBADD = $(LIB_TDEIO) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI)
 libkstore_la_SOURCES = KoStore.cpp KoTarStore.cpp KoDirectoryStore.cpp KoZipStore.cpp KoStoreDrag.cpp KoStoreBase.cpp KoXmlWriter.cpp
 libkstore_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 $(KDE_LDFLAGS) -no-undefined
 include_HEADERS = KoStore.h KoStoreDevice.h KoXmlWriter.h
--- a/plugins/scan/Makefile.am
+++ b/plugins/scan/Makefile.am
@ -15,7 +15,7 @@ kde_module_LTLIBRARIES = kofficescan.la
 kofficescan_la_SOURCES = scan.cpp
 noinst_HEADERS = scan.h

-kofficescan_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+kofficescan_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 kofficescan_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEIO) $(LIB_KOFFICECORE)

 kofficescan_la_METASOURCES = AUTO
--- a/tools/converter/Makefile.am
+++ b/tools/converter/Makefile.am
@ -2,7 +2,7 @@ INCLUDES = $(KOFFICE_INCLUDES) $(all_includes)

 bin_PROGRAMS = koconverter
 koconverter_SOURCES = koconverter.cpp
-koconverter_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+koconverter_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 koconverter_LDADD = $(top_builddir)/lib/kofficecore/libkofficecore.la

 METASOURCES = AUTO
--- a/tools/tdefile-plugins/abiword/Makefile.am
+++ b/tools/tdefile-plugins/abiword/Makefile.am
@ -9,7 +9,7 @@ noinst_HEADERS   = tdefile_abiword.h
 kde_module_LTLIBRARIES = tdefile_abiword.la

 tdefile_abiword_la_SOURCES = tdefile_abiword.cpp
-tdefile_abiword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+tdefile_abiword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 tdefile_abiword_la_LIBADD = $(KOFFICE_LIBS)

 # let automoc handle all of the meta source files (moc)
--- a/tools/tdefile-plugins/gnumeric/Makefile.am
+++ b/tools/tdefile-plugins/gnumeric/Makefile.am
@ -9,7 +9,7 @@ noinst_HEADERS   = tdefile_gnumeric.h
 kde_module_LTLIBRARIES = tdefile_gnumeric.la

 tdefile_gnumeric_la_SOURCES = tdefile_gnumeric.cpp
-tdefile_gnumeric_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+tdefile_gnumeric_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 tdefile_gnumeric_la_LIBADD = $(KOFFICE_LIBS)

 # let automoc handle all of the meta source files (moc)
--- a/tools/tdefile-plugins/koffice/Makefile.am
+++ b/tools/tdefile-plugins/koffice/Makefile.am
@ -9,7 +9,7 @@ noinst_HEADERS   = tdefile_koffice.h
 kde_module_LTLIBRARIES = tdefile_koffice.la

 tdefile_koffice_la_SOURCES = tdefile_koffice.cpp
-tdefile_koffice_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+tdefile_koffice_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 tdefile_koffice_la_LIBADD = $(KOFFICE_LIBS)

 # let automoc handle all of the meta source files (moc)
--- a/tools/tdefile-plugins/ooo/Makefile.am
+++ b/tools/tdefile-plugins/ooo/Makefile.am
@ -9,7 +9,7 @@ noinst_HEADERS   = tdefile_ooo.h
 kde_module_LTLIBRARIES = tdefile_ooo.la

 tdefile_ooo_la_SOURCES = tdefile_ooo.cpp
-tdefile_ooo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+tdefile_ooo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts
 tdefile_ooo_la_LIBADD = $(KOFFICE_LIBS)

 # let automoc handle all of the meta source files (moc)
--- a/tools/thumbnail/Makefile.am
+++ b/tools/thumbnail/Makefile.am
@ -5,11 +5,11 @@ kde_module_LTLIBRARIES = clipartthumbnail.la kofficethumbnail.la

 clipartthumbnail_la_SOURCES = clipartcreator.cpp
 clipartthumbnail_la_LIBADD = $(KOFFICE_LIBS) # for KoClipartCollection
-clipartthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+clipartthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts

 kofficethumbnail_la_SOURCES = kofficecreator.cpp
 kofficethumbnail_la_LIBADD = $(KOFFICE_LIBS)
-kofficethumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+kofficethumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts

 # otherofficethumbnail.desktop is currently not installed, as it gives too many problems
 kde_services_DATA = clipartthumbnail.desktop kofficethumbnail.desktop