LIB_QT -> LIB_TQT conversion to align to updated admin module

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

32 files changed, 52 insertions, 52 deletions

diff --git a/kexi/Makefile.am b/kexi/Makefile.am
index 7c4e7295..6c230399 100644
--- 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 \
diff --git a/kexi/formeditor/factories/Makefile.am b/kexi/formeditor/factories/Makefile.am
index 4cd31db8..f2051fc6 100644
--- 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
diff --git a/kexi/formeditor/test/Makefile.am b/kexi/formeditor/test/Makefile.am
index e7f52770..a9aec33a 100644
--- 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
 
diff --git a/kexi/kexidb/Makefile.am b/kexi/kexidb/Makefile.am
index e2465394..84c6bbb8 100644
--- 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)
 
diff --git a/kexi/kexidb/drivers/mySQL/Makefile.am b/kexi/kexidb/drivers/mySQL/Makefile.am
index 19038b14..707b23d8 100644
--- 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
diff --git a/kexi/kexidb/drivers/odbc/Makefile.am b/kexi/kexidb/drivers/odbc/Makefile.am
index 97c69301..2618e674 100644
--- 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
 
diff --git a/kexi/kexidb/drivers/pqxx/Makefile.am b/kexi/kexidb/drivers/pqxx/Makefile.am
index fe0c5633..407c4840 100644
--- 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
 
diff --git a/kexi/kexidb/drivers/sqlite/Makefile.am b/kexi/kexidb/drivers/sqlite/Makefile.am
index 0b782243..d749054d 100644
--- 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
diff --git a/kexi/kexidb/drivers/sqlite2/Makefile.am b/kexi/kexidb/drivers/sqlite2/Makefile.am
index 7e783c4a..73ab5aba 100644
--- 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
diff --git a/kexi/kexiutils/Makefile.am b/kexi/kexiutils/Makefile.am
index 616b57a7..6418673f 100644
--- 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)
 
diff --git a/kexi/migration/Makefile.am b/kexi/migration/Makefile.am
index eaac66a8..c954cd61 100644
--- 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
 
diff --git a/kexi/migration/mysql/Makefile.am b/kexi/migration/mysql/Makefile.am
index eaea53b9..f1702664 100644
--- 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
 
diff --git a/kexi/migration/pqxx/Makefile.am b/kexi/migration/pqxx/Makefile.am
index 87f6c247..8a491993 100644
--- 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
 
diff --git a/kexi/migration/txt/Makefile.am b/kexi/migration/txt/Makefile.am
index a7dbe779..2e2d81fa 100644
--- 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
 
diff --git a/kexi/plugins/forms/Makefile.am b/kexi/plugins/forms/Makefile.am
index aff5c467..413ceb08 100644
--- 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 \
diff --git a/kexi/plugins/importexport/csv/Makefile.am b/kexi/plugins/importexport/csv/Makefile.am
index b2f18039..1ff6cf43 100644
--- 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 \
diff --git a/kexi/plugins/macros/kexiactions/Makefile.am b/kexi/plugins/macros/kexiactions/Makefile.am
index b61cbcd3..5366715c 100644
--- 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 = .
diff --git a/kexi/plugins/macros/lib/Makefile.am b/kexi/plugins/macros/lib/Makefile.am
index 4540f2f4..f1b56c9c 100644
--- 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 = .
diff --git a/kexi/plugins/macros/tests/Makefile.am b/kexi/plugins/macros/tests/Makefile.am
index 324a03d4..44068152 100644
--- 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
 
diff --git a/kexi/plugins/migration/Makefile.am b/kexi/plugins/migration/Makefile.am
index 62d29696..c17b1086 100644
--- 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 \
diff --git a/kexi/plugins/queries/Makefile.am b/kexi/plugins/queries/Makefile.am
index 027e318f..ecd80c72 100644
--- 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 \
diff --git a/kexi/plugins/relations/Makefile.am b/kexi/plugins/relations/Makefile.am
index 8fbba9e3..2bd2eac5 100644
--- 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 \
diff --git a/kexi/plugins/scripting/kexiapp/Makefile.am b/kexi/plugins/scripting/kexiapp/Makefile.am
index 53ac4e88..54c53140 100644
--- 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) \
diff --git a/kexi/plugins/scripting/kexidb/Makefile.am b/kexi/plugins/scripting/kexidb/Makefile.am
index 70b23da9..cb5f8388 100644
--- 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) \
diff --git a/kexi/plugins/scripting/kexiscripting/Makefile.am b/kexi/plugins/scripting/kexiscripting/Makefile.am
index ef16e44a..d6c56e0f 100644
--- 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 \
diff --git a/kexi/plugins/tables/Makefile.am b/kexi/plugins/tables/Makefile.am
index 05a1d182..316e7551 100644
--- 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 \
diff --git a/kexi/tests/altertable/Makefile.am b/kexi/tests/altertable/Makefile.am
index c4708ba9..65617ecb 100644
--- 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
 
diff --git a/kexi/tests/newapi/Makefile.am b/kexi/tests/newapi/Makefile.am
index 5e4d78ae..b279ad4e 100644
--- 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
 
diff --git a/kexi/tests/parser/Makefile.am b/kexi/tests/parser/Makefile.am
index 6068e2c4..d009895b 100644
--- 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
 
 
diff --git a/kexi/tests/startup/Makefile.am b/kexi/tests/startup/Makefile.am
index 0596a74a..133a7feb 100644
--- 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)
 
diff --git a/kexi/tests/tableview/Makefile.am b/kexi/tests/tableview/Makefile.am
index d6c097cd..2aefafba 100644
--- 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
 
diff --git a/kexi/tests/widgets/Makefile.am b/kexi/tests/widgets/Makefile.am
index b56d7bff..683fcf89 100644
--- 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