From dbf4c38635131ec8d375a3ad074a180acc755d69 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Sat, 10 Jun 2023 14:48:08 +0900
Subject: [PATCH] Drop TQT_NO_COMPAT code

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 kopete/kopete/chatwindow/tests/Makefile.am | 2 +-
 kopete/kopete/tdeconf_update/Makefile.am   | 2 +-
 kopete/libkopete/Makefile.am               | 2 +-
 kopete/libkopete/avdevice/Makefile.am      | 2 +-
 kopete/libkopete/private/Makefile.am       | 2 +-
 kopete/libkopete/tests/Makefile.am         | 2 +-
 kopete/libkopete/tests/mock/Makefile.am    | 2 +-
 kopete/libkopete/ui/Makefile.am            | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kopete/kopete/chatwindow/tests/Makefile.am b/kopete/kopete/chatwindow/tests/Makefile.am
index d2a7442c..293ab27d 100644
--- 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
diff --git a/kopete/kopete/tdeconf_update/Makefile.am b/kopete/kopete/tdeconf_update/Makefile.am
index e5702815..9d3f56b7 100644
--- 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 \
diff --git a/kopete/libkopete/Makefile.am b/kopete/libkopete/Makefile.am
index 01694283..5b3d32fd 100644
--- 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)
 
diff --git a/kopete/libkopete/avdevice/Makefile.am b/kopete/libkopete/avdevice/Makefile.am
index 0ec1bacc..825c0dc6 100644
--- 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
diff --git a/kopete/libkopete/private/Makefile.am b/kopete/libkopete/private/Makefile.am
index 0a7047c0..bbc79076 100644
--- 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
diff --git a/kopete/libkopete/tests/Makefile.am b/kopete/libkopete/tests/Makefile.am
index 70281a1b..9b5970db 100644
--- 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
 
diff --git a/kopete/libkopete/tests/mock/Makefile.am b/kopete/libkopete/tests/mock/Makefile.am
index 4fc30ecc..d1c384d5 100644
--- 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
diff --git a/kopete/libkopete/ui/Makefile.am b/kopete/libkopete/ui/Makefile.am
index 01dfec6b..277c1a92 100644
--- 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