Drop TQT_NO_COMPAT code

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit dbf4c38635)
r14.1.x
Michele Calgaro 1 year ago
parent 762a46f071
commit 43562a4d0b
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -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\" $(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/kopete/chatwindow -I$(top_srcdir)/kopete/libkopete $(all_includes) -DSRCDIR=\"$(top_srcdir)/kopete/kopete/chatwindow/tests\"
METASOURCES = AUTO METASOURCES = AUTO
check_LTLIBRARIES = tdeunittest_chatwindowstyle_test.la tdeunittest_chatwindowstylerendering_test.la check_LTLIBRARIES = tdeunittest_chatwindowstyle_test.la tdeunittest_chatwindowstylerendering_test.la

@ -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 \ update_DATA = kopete-pluginloader.upd kopete-account-tdeconf_update.upd \
kopete-pluginloader2.upd kopete-jabberproxytype-tdeconf_update.upd \ kopete-pluginloader2.upd kopete-jabberproxytype-tdeconf_update.upd \

@ -13,7 +13,7 @@ SUBDIRS = $(COMPAT_DIR) private ui . avdevice
METASOURCES = AUTO METASOURCES = AUTO
AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT \ AM_CPPFLAGS = -DKDE_NO_COMPAT \
$(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/libkopete/private \ $(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/libkopete/private \
-I$(top_srcdir)/kopete/libkopete/ui $(all_includes) -I$(top_srcdir)/kopete/libkopete/ui $(all_includes)

@ -1,5 +1,5 @@
INCLUDES =$(GLINC) $(all_includes) 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 \ $(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/libkopete/private \
-I$(top_srcdir)/kopete/libkopete/ui $(all_includes) -I$(top_srcdir)/kopete/libkopete/ui $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO

@ -1,6 +1,6 @@
METASOURCES = AUTO 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) $(KOPETE_INCLUDES) $(all_includes)
noinst_LTLIBRARIES = libkopeteprivate.la noinst_LTLIBRARIES = libkopeteprivate.la

@ -1,5 +1,5 @@
SUBDIRS = mock . 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\" $(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 METASOURCES = AUTO

@ -1,5 +1,5 @@
METASOURCES = AUTO 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) $(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/libkopete/private $(all_includes)
noinst_LTLIBRARIES = libkopete_mock.la noinst_LTLIBRARIES = libkopete_mock.la

@ -1,5 +1,5 @@
METASOURCES = AUTO 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) $(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/libkopete/private $(all_includes)
noinst_LTLIBRARIES = libkopeteui.la noinst_LTLIBRARIES = libkopeteui.la

Loading…
Cancel
Save