summaryrefslogtreecommitdiffstats
path: root/languages/cpp
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-09-17 23:19:59 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2018-09-17 23:19:59 +0900
commitdd8130b36118e19da045daf728651cd37f012faa (patch)
tree2d53a25ce098de74070ee461a721450116c7f4f1 /languages/cpp
parent8ede967fbfe73e9a4b81ed7f5566a3ad24b7f6f2 (diff)
downloadtdevelop-dd8130b36118e19da045daf728651cd37f012faa.tar.gz
tdevelop-dd8130b36118e19da045daf728651cd37f012faa.zip
LIB_QT -> LIB_TQT conversion to align to updated admin module
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'languages/cpp')
-rw-r--r--languages/cpp/app_templates/kapp/src-Makefile.am4
-rw-r--r--languages/cpp/app_templates/kateplugin/src-Makefile.am2
-rw-r--r--languages/cpp/app_templates/kateplugin2/src-Makefile.am2
-rw-r--r--languages/cpp/app_templates/kdedcop/src-Makefile.am2
-rw-r--r--languages/cpp/app_templates/kdevlang/src-Makefile.am2
-rw-r--r--languages/cpp/app_templates/kdevpart/src-Makefile.am2
-rw-r--r--languages/cpp/app_templates/khello/src-Makefile.am2
-rw-r--r--languages/cpp/app_templates/khello2/src-Makefile.am2
-rw-r--r--languages/cpp/app_templates/kicker/src-Makefile.am2
-rw-r--r--languages/cpp/app_templates/kofficepart/src-Makefile.am6
-rw-r--r--languages/cpp/app_templates/konqnavpanel/src-Makefile.am2
-rw-r--r--languages/cpp/app_templates/kpartapp/src-Makefile.am4
-rw-r--r--languages/cpp/app_templates/kpartplugin/src-Makefile.am2
-rw-r--r--languages/cpp/app_templates/kxt/src-Makefile.am2
-rw-r--r--languages/cpp/app_templates/noatunui/src-Makefile.am2
-rw-r--r--languages/cpp/app_templates/noatunvisual/src-Makefile.am2
-rw-r--r--languages/cpp/app_templates/tdefileplugin/src-Makefile.am2
-rw-r--r--languages/cpp/app_templates/tdeioslave/src-Makefile.am2
-rw-r--r--languages/cpp/app_templates/tdescreensaver/src-Makefile.am4
-rw-r--r--languages/cpp/debugger/mi/Makefile.am2
20 files changed, 25 insertions, 25 deletions
diff --git a/languages/cpp/app_templates/kapp/src-Makefile.am b/languages/cpp/app_templates/kapp/src-Makefile.am
index 8125665b..ee5e379b 100644
--- a/languages/cpp/app_templates/kapp/src-Makefile.am
+++ b/languages/cpp/app_templates/kapp/src-Makefile.am
@@ -8,7 +8,7 @@ bin_PROGRAMS = %{APPNAMELC} %{APPNAMELC}_client
INCLUDES = $(all_includes)
# the library search path.
-%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEIO)
+%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEIO)
# the libraries to link against.
%{APPNAMELC}_LDADD = $(LIB_TDEFILE) $(LIB_TDEPRINT)
@@ -21,7 +21,7 @@ INCLUDES = $(all_includes)
noinst_HEADERS = %{APPNAMELC}.h %{APPNAMELC}view.h pref.h
# client stuff
-%{APPNAMELC}_client_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEIO)
+%{APPNAMELC}_client_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEIO)
%{APPNAMELC}_client_LDADD = $(LIB_TDECORE)
%{APPNAMELC}_client_SOURCES = %{APPNAMELC}_client.cpp
diff --git a/languages/cpp/app_templates/kateplugin/src-Makefile.am b/languages/cpp/app_templates/kateplugin/src-Makefile.am
index ef4450c1..91f3bc60 100644
--- a/languages/cpp/app_templates/kateplugin/src-Makefile.am
+++ b/languages/cpp/app_templates/kateplugin/src-Makefile.am
@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = lib%{APPNAMELC}plugin.la
lib%{APPNAMELC}plugin_la_SOURCES = plugin_%{APPNAMELC}.cpp
lib%{APPNAMELC}plugin_la_LIBADD = -lkateinterfaces
-lib%{APPNAMELC}plugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
+lib%{APPNAMELC}plugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
pluginsdir = $(kde_datadir)/kate/plugins/%{APPNAMELC}
plugins_DATA = plugin_%{APPNAMELC}.rc
diff --git a/languages/cpp/app_templates/kateplugin2/src-Makefile.am b/languages/cpp/app_templates/kateplugin2/src-Makefile.am
index 1cc61110..409af4d6 100644
--- a/languages/cpp/app_templates/kateplugin2/src-Makefile.am
+++ b/languages/cpp/app_templates/kateplugin2/src-Makefile.am
@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = lib%{APPNAMELC}plugin.la
lib%{APPNAMELC}plugin_la_SOURCES = plugin_%{APPNAMELC}.cpp
lib%{APPNAMELC}plugin_la_LIBADD = -lkateinterfaces
-lib%{APPNAMELC}plugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
+lib%{APPNAMELC}plugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
pluginsdir = $(kde_datadir)/kate/plugins/%{APPNAMELC}
plugins_DATA = plugin_%{APPNAMELC}.rc
diff --git a/languages/cpp/app_templates/kdedcop/src-Makefile.am b/languages/cpp/app_templates/kdedcop/src-Makefile.am
index 19ddf2fb..380bdce4 100644
--- a/languages/cpp/app_templates/kdedcop/src-Makefile.am
+++ b/languages/cpp/app_templates/kdedcop/src-Makefile.am
@@ -19,5 +19,5 @@ bin_PROGRAMS = %{APPNAMELC}
# the application source, library search path, and link libraries
%{APPNAMELC}_SOURCES = main.cpp %{APPNAMELC}.cpp %{APPNAMELC}_iface.skel mainclass.cpp
-%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
+%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
%{APPNAMELC}_LDADD = $(LIB_TDEUI)
diff --git a/languages/cpp/app_templates/kdevlang/src-Makefile.am b/languages/cpp/app_templates/kdevlang/src-Makefile.am
index 18b7a21a..20d51b48 100644
--- a/languages/cpp/app_templates/kdevlang/src-Makefile.am
+++ b/languages/cpp/app_templates/kdevlang/src-Makefile.am
@@ -1,7 +1,7 @@
AM_CPPFLAGS = -I$(kde_includes)/tdevelop/interfaces -I$(kde_includes)/tdevelop/util -I$(kde_includes)/kinterfacedesigner $(all_includes)
kde_module_LTLIBRARIES = libkdev%{APPNAMELC}.la
-libkdev%{APPNAMELC}_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
+libkdev%{APPNAMELC}_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
libkdev%{APPNAMELC}_la_LIBADD = -ltdevelop
libkdev%{APPNAMELC}_la_SOURCES = %{APPNAMELC}_part.cpp
diff --git a/languages/cpp/app_templates/kdevpart/src-Makefile.am b/languages/cpp/app_templates/kdevpart/src-Makefile.am
index 5fe18f43..93595138 100644
--- a/languages/cpp/app_templates/kdevpart/src-Makefile.am
+++ b/languages/cpp/app_templates/kdevpart/src-Makefile.am
@@ -1,7 +1,7 @@
INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
kde_module_LTLIBRARIES = libkdev%{APPNAMELC}.la
-libkdev%{APPNAMELC}_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
+libkdev%{APPNAMELC}_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(KDE_PLUGIN) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
libkdev%{APPNAMELC}_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
libkdev%{APPNAMELC}_la_SOURCES = %{APPNAMELC}part.cpp %{APPNAMELC}widget.cpp \
diff --git a/languages/cpp/app_templates/khello/src-Makefile.am b/languages/cpp/app_templates/khello/src-Makefile.am
index 5eed38b6..279a58fd 100644
--- a/languages/cpp/app_templates/khello/src-Makefile.am
+++ b/languages/cpp/app_templates/khello/src-Makefile.am
@@ -22,7 +22,7 @@ bin_PROGRAMS = %{APPNAMELC}
# the application source, library search path, and link libraries
%{APPNAMELC}_SOURCES = main.cpp %{APPNAMELC}.cpp
-%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
+%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
%{APPNAMELC}_LDADD = $(LIB_TDEUI)
# this is where the desktop file will go
diff --git a/languages/cpp/app_templates/khello2/src-Makefile.am b/languages/cpp/app_templates/khello2/src-Makefile.am
index 453bfd55..fa431413 100644
--- a/languages/cpp/app_templates/khello2/src-Makefile.am
+++ b/languages/cpp/app_templates/khello2/src-Makefile.am
@@ -22,7 +22,7 @@ bin_PROGRAMS = %{APPNAMELC}
# the application source, library search path, and link libraries
%{APPNAMELC}_SOURCES = main.cpp %{APPNAMELC}.cpp %{APPNAMELC}widget.cpp %{APPNAMELC}widgetbase.ui
-%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
+%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
%{APPNAMELC}_LDADD = $(LIB_TDEUI)
# this is where the desktop file will go
diff --git a/languages/cpp/app_templates/kicker/src-Makefile.am b/languages/cpp/app_templates/kicker/src-Makefile.am
index 296282f5..54711447 100644
--- a/languages/cpp/app_templates/kicker/src-Makefile.am
+++ b/languages/cpp/app_templates/kicker/src-Makefile.am
@@ -4,7 +4,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = %{APPNAMELC}_panelapplet.la
%{APPNAMELC}_panelapplet_la_SOURCES = %{APPNAMELC}.cpp
-%{APPNAMELC}_panelapplet_la_LDFLAGS = -module -avoid-version $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
+%{APPNAMELC}_panelapplet_la_LDFLAGS = -module -avoid-version $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
%{APPNAMELC}_panelapplet_la_LIBADD = $(LIB_TDEUI)
%{APPNAMELC}_DATA = %{APPNAMELC}.desktop
diff --git a/languages/cpp/app_templates/kofficepart/src-Makefile.am b/languages/cpp/app_templates/kofficepart/src-Makefile.am
index dbe77db5..6e355328 100644
--- a/languages/cpp/app_templates/kofficepart/src-Makefile.am
+++ b/languages/cpp/app_templates/kofficepart/src-Makefile.am
@@ -5,19 +5,19 @@ INCLUDES = $(KOFFICE_INCLUDES) $(all_includes)
kde_module_LTLIBRARIES = lib%{APPNAMELC}part.la
lib%{APPNAMELC}part_la_SOURCES = %{APPNAMELC}_part.cpp \
%{APPNAMELC}_view.cpp %{APPNAMELC}_factory.cpp
-lib%{APPNAMELC}part_la_LDFLAGS = $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
+lib%{APPNAMELC}part_la_LDFLAGS = $(KDE_PLUGIN) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
lib%{APPNAMELC}part_la_LIBADD = -lkofficeui
## The tdeinit loadable module
lib_LTLIBRARIES = %{APPNAMELC}.la
%{APPNAMELC}_la_SOURCES = %{APPNAMELC}.cpp
-%{APPNAMELC}_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
+%{APPNAMELC}_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
%{APPNAMELC}_la_LIBADD = -lkofficecore
## The executable
bin_PROGRAMS = %{APPNAMELC}
%{APPNAMELC}_SOURCES = dummy.cpp
-%{APPNAMELC}_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
+%{APPNAMELC}_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
%{APPNAMELC}_LDADD = %{APPNAMELC}.la
dummy.cpp:
diff --git a/languages/cpp/app_templates/konqnavpanel/src-Makefile.am b/languages/cpp/app_templates/konqnavpanel/src-Makefile.am
index 18790bd3..938305b5 100644
--- a/languages/cpp/app_templates/konqnavpanel/src-Makefile.am
+++ b/languages/cpp/app_templates/konqnavpanel/src-Makefile.am
@@ -4,7 +4,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES=konqsidebar_%{APPNAMELC}.la
konqsidebar_%{APPNAMELC}_la_SOURCES = %{APPNAMELC}.cpp
-konqsidebar_%{APPNAMELC}_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) -lkonqsidebarplugin
+konqsidebar_%{APPNAMELC}_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) -lkonqsidebarplugin
konqsidebar_%{APPNAMELC}_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEFILE)
%{APPNAMELC}_entry_DATA = %{APPNAMELC}.desktop
diff --git a/languages/cpp/app_templates/kpartapp/src-Makefile.am b/languages/cpp/app_templates/kpartapp/src-Makefile.am
index 3fe0f319..b0244dd1 100644
--- a/languages/cpp/app_templates/kpartapp/src-Makefile.am
+++ b/languages/cpp/app_templates/kpartapp/src-Makefile.am
@@ -23,7 +23,7 @@ bin_PROGRAMS = %{APPNAMELC}
# the application source, library search path, and link libraries
%{APPNAMELC}_SOURCES = main.cpp %{APPNAMELC}.cpp
-%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEIO)
+%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEIO)
%{APPNAMELC}_LDADD = $(LIB_TDEPARTS)
# this is where the desktop file will go
@@ -41,7 +41,7 @@ kde_module_LTLIBRARIES = lib%{APPNAMELC}part.la
# the Part's source, library search path, and link libraries
lib%{APPNAMELC}part_la_SOURCES = %{APPNAMELC}_part.cpp
-lib%{APPNAMELC}part_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEIO)
+lib%{APPNAMELC}part_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEIO)
lib%{APPNAMELC}part_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEFILE)
# this is where the desktop file will go
diff --git a/languages/cpp/app_templates/kpartplugin/src-Makefile.am b/languages/cpp/app_templates/kpartplugin/src-Makefile.am
index d74389bd..3409c920 100644
--- a/languages/cpp/app_templates/kpartplugin/src-Makefile.am
+++ b/languages/cpp/app_templates/kpartplugin/src-Makefile.am
@@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = lib%{APPNAMELC}plugin.la
# using the TDEHTML Part
lib%{APPNAMELC}plugin_la_SOURCES = plugin_%{APPNAMELC}.cpp
lib%{APPNAMELC}plugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEHTML)
-lib%{APPNAMELC}plugin_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
+lib%{APPNAMELC}plugin_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
# Install the .rc file in the Part's directory (in this case, the part
# is TDEHTMLPart)
diff --git a/languages/cpp/app_templates/kxt/src-Makefile.am b/languages/cpp/app_templates/kxt/src-Makefile.am
index 253c2517..d42188ed 100644
--- a/languages/cpp/app_templates/kxt/src-Makefile.am
+++ b/languages/cpp/app_templates/kxt/src-Makefile.am
@@ -11,7 +11,7 @@ INCLUDES = $(all_includes)
METASOURCES = AUTO
# the library search path.
-%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
+%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
# the libraries to link against.
%{APPNAMELC}_LDADD = $(LIB_TDEFILE) $(LIB_TDEPRINT)
diff --git a/languages/cpp/app_templates/noatunui/src-Makefile.am b/languages/cpp/app_templates/noatunui/src-Makefile.am
index 6043abc5..1dd00b98 100644
--- a/languages/cpp/app_templates/noatunui/src-Makefile.am
+++ b/languages/cpp/app_templates/noatunui/src-Makefile.am
@@ -5,7 +5,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = noatun_%{APPNAMELC}plugin.la
noatun_%{APPNAMELC}plugin_la_SOURCES = plugin_%{APPNAMELC}.cpp plugin_%{APPNAMELC}_impl.cpp
-noatun_%{APPNAMELC}plugin_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
+noatun_%{APPNAMELC}plugin_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
noatun_%{APPNAMELC}plugin_la_LIBADD = $(LIB_TDEFILE) -lnoatun -lnoatuncontrols \
-lqtmcop -lkmedia2_idl -lsoundserver_idl
diff --git a/languages/cpp/app_templates/noatunvisual/src-Makefile.am b/languages/cpp/app_templates/noatunvisual/src-Makefile.am
index 023712e0..5a9c43f5 100644
--- a/languages/cpp/app_templates/noatunvisual/src-Makefile.am
+++ b/languages/cpp/app_templates/noatunvisual/src-Makefile.am
@@ -5,7 +5,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = noatun_%{APPNAMELC}plugin.la
noatun_%{APPNAMELC}plugin_la_SOURCES = plugin_%{APPNAMELC}.cpp plugin_%{APPNAMELC}_impl.cpp
-noatun_%{APPNAMELC}plugin_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(LIBSDL_RPATH) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
+noatun_%{APPNAMELC}plugin_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(LIBSDL_RPATH) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
noatun_%{APPNAMELC}plugin_la_CXXFLAGS = $(LIBSDL_CFLAGS)
noatun_%{APPNAMELC}plugin_la_LIBADD = $(LIB_TDEFILE) $(LIBSDL_LIBS) -lnoatun -lm
diff --git a/languages/cpp/app_templates/tdefileplugin/src-Makefile.am b/languages/cpp/app_templates/tdefileplugin/src-Makefile.am
index 31078c93..9e82afcd 100644
--- a/languages/cpp/app_templates/tdefileplugin/src-Makefile.am
+++ b/languages/cpp/app_templates/tdefileplugin/src-Makefile.am
@@ -8,7 +8,7 @@ noinst_HEADERS = tdefile_%{APPNAMELC}.h
kde_module_LTLIBRARIES = tdefile_%{APPNAMELC}.la
tdefile_%{APPNAMELC}_la_SOURCES = tdefile_%{APPNAMELC}.cpp
-tdefile_%{APPNAMELC}_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEIO)
+tdefile_%{APPNAMELC}_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEIO)
tdefile_%{APPNAMELC}_la_LIBADD = $(LIB_TDEIO)
# let automoc handle all of the meta source files ((moc))
diff --git a/languages/cpp/app_templates/tdeioslave/src-Makefile.am b/languages/cpp/app_templates/tdeioslave/src-Makefile.am
index 90e6cdfc..2c2f79ca 100644
--- a/languages/cpp/app_templates/tdeioslave/src-Makefile.am
+++ b/languages/cpp/app_templates/tdeioslave/src-Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = tdeio_%{APPNAMELC}.la
tdeio_%{APPNAMELC}_la_SOURCES = %{APPNAMELC}.cpp
tdeio_%{APPNAMELC}_la_LIBADD = -ltdeio
-tdeio_%{APPNAMELC}_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
+tdeio_%{APPNAMELC}_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
protocol_DATA = %{APPNAMELC}.protocol
protocoldir = $(kde_servicesdir)
diff --git a/languages/cpp/app_templates/tdescreensaver/src-Makefile.am b/languages/cpp/app_templates/tdescreensaver/src-Makefile.am
index b0cc8d33..1d419822 100644
--- a/languages/cpp/app_templates/tdescreensaver/src-Makefile.am
+++ b/languages/cpp/app_templates/tdescreensaver/src-Makefile.am
@@ -5,12 +5,12 @@ AM_CPPFLAGS = -UQT_NO_ASCII_CAST
METASOURCES = AUTO
INCLUDES = $(all_includes)
-LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
+LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
LDADD = $(LIB_TDEUI) -ltdescreensaver -lm
bin_PROGRAMS = %{APPNAMELC}.kss
%{APPNAMELC}_kss_SOURCES = %{APPNAMELC}ui.ui %{APPNAMELC}.cpp
-%{APPNAMELC}_kss_LDADD = $(LIB_QT) $(LIB_TDECORE) $(LDADD) $(LIB_TDESYCOCA)
+%{APPNAMELC}_kss_LDADD = $(LIB_TQT) $(LIB_TDECORE) $(LDADD) $(LIB_TDESYCOCA)
#datadir = $(kde_datadir)/%{APPNAMELC}
diff --git a/languages/cpp/debugger/mi/Makefile.am b/languages/cpp/debugger/mi/Makefile.am
index d6cdf5f7..17531168 100644
--- a/languages/cpp/debugger/mi/Makefile.am
+++ b/languages/cpp/debugger/mi/Makefile.am
@@ -7,6 +7,6 @@ INCLUDES = $(all_includes)
lib_LTLIBRARIES = libgdbmi_parser.la
libgdbmi_parser_la_LDFLAGS = $(all_libraries)
-libgdbmi_parser_la_LIBADD = $(LIB_QT)
+libgdbmi_parser_la_LIBADD = $(LIB_TQT)
libgdbmi_parser_la_SOURCES = gdbmi.cpp miparser.cpp milexer.cpp