Drop TQT_NO_COMPAT code

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
1 year ago · dbf4c38635
parent 85e7328d52
commit dbf4c38635
8 changed files with 8 additions and 8 deletions
--- a/kopete/kopete/chatwindow/tests/Makefile.am
+++ b/kopete/kopete/chatwindow/tests/Makefile.am
@ -1,4 +1,4 @@
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_ASCII_CAST -DTQT_NO_COMPAT \
+AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_ASCII_CAST \
 	$(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/kopete/chatwindow -I$(top_srcdir)/kopete/libkopete $(all_includes) -DSRCDIR=\"$(top_srcdir)/kopete/kopete/chatwindow/tests\"
 METASOURCES = AUTO
 check_LTLIBRARIES = tdeunittest_chatwindowstyle_test.la tdeunittest_chatwindowstylerendering_test.la
--- a/kopete/kopete/tdeconf_update/Makefile.am
+++ b/kopete/kopete/tdeconf_update/Makefile.am
@ -1,4 +1,4 @@
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT $(all_includes)
+AM_CPPFLAGS = -DKDE_NO_COMPAT $(all_includes)

 update_DATA = kopete-pluginloader.upd kopete-account-tdeconf_update.upd \
 	kopete-pluginloader2.upd kopete-jabberproxytype-tdeconf_update.upd \
--- a/kopete/libkopete/Makefile.am
+++ b/kopete/libkopete/Makefile.am
@ -13,7 +13,7 @@ SUBDIRS = $(COMPAT_DIR) private ui . avdevice

 METASOURCES = AUTO

-AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT \
+AM_CPPFLAGS = -DKDE_NO_COMPAT \
 	$(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/libkopete/private \
 	-I$(top_srcdir)/kopete/libkopete/ui $(all_includes)

--- a/kopete/libkopete/avdevice/Makefile.am
+++ b/kopete/libkopete/avdevice/Makefile.am
@ -1,5 +1,5 @@
 INCLUDES =$(GLINC) $(all_includes)
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT -DTQT_NO_CAST_ASCII -DTQT_NO_ASCII_CAST \
+AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_CAST_ASCII -DTQT_NO_ASCII_CAST \
        $(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/libkopete/private \
        -I$(top_srcdir)/kopete/libkopete/ui $(all_includes)
 METASOURCES = AUTO
--- a/kopete/libkopete/private/Makefile.am
+++ b/kopete/libkopete/private/Makefile.am
@ -1,6 +1,6 @@
 METASOURCES = AUTO

-AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT -DTQT_NO_CAST_ASCII -DTQT_NO_ASCII_CAST \
+AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_CAST_ASCII -DTQT_NO_ASCII_CAST \
 	$(KOPETE_INCLUDES) $(all_includes)

 noinst_LTLIBRARIES = libkopeteprivate.la
--- a/kopete/libkopete/tests/Makefile.am
+++ b/kopete/libkopete/tests/Makefile.am
@ -1,5 +1,5 @@
 SUBDIRS = mock .
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_ASCII_CAST -DTQT_NO_COMPAT \
+AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_ASCII_CAST \
 	$(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/libkopete/private -I$(top_srcdir)/kopete/libkopete/private -I$(top_srcdir)/kopete/libkopete/tests/mock $(all_includes) -DSRCDIR=\"$(top_srcdir)/kopete/libkopete/tests\"
 METASOURCES = AUTO

--- a/kopete/libkopete/tests/mock/Makefile.am
+++ b/kopete/libkopete/tests/mock/Makefile.am
@ -1,5 +1,5 @@
 METASOURCES = AUTO
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT -DTQT_NO_CAST_ASCII -DTQT_NO_ASCII_CAST \
+AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_CAST_ASCII -DTQT_NO_ASCII_CAST \
 	$(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/libkopete/private $(all_includes)

 noinst_LTLIBRARIES = libkopete_mock.la
--- a/kopete/libkopete/ui/Makefile.am
+++ b/kopete/libkopete/ui/Makefile.am
@ -1,5 +1,5 @@
 METASOURCES = AUTO
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT \
+AM_CPPFLAGS = -DKDE_NO_COMPAT \
 	$(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/libkopete/private $(all_includes)

 noinst_LTLIBRARIES = libkopeteui.la