summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-06-10 12:21:15 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-06-11 18:05:52 +0900
commiteebb278115b65c2ee046dc8183197029564766f3 (patch)
treeca30c657d5feb19b80c09c04e7e016ae29898a89
parent1070f24afc4d8965f939d0ec7ea0a68661666a03 (diff)
downloadtdelibs-eebb278115b65c2ee046dc8183197029564766f3.tar.gz
tdelibs-eebb278115b65c2ee046dc8183197029564766f3.zip
Drop TQT_NO_COMPAT code
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit de0664d904516590b4a9bf88615461137ae879bd)
-rw-r--r--tdespell2/Makefile.am2
-rw-r--r--tdespell2/tests/Makefile.am2
-rw-r--r--tdespell2/ui/Makefile.am2
-rw-r--r--tdewallet/tests/CMakeLists.txt1
-rw-r--r--tdewallet/tests/Makefile.am2
-rw-r--r--win/pro_files/tdemdi/test/test.pro2
6 files changed, 5 insertions, 6 deletions
diff --git a/tdespell2/Makefile.am b/tdespell2/Makefile.am
index 455b1f5c5..6e6549f5b 100644
--- a/tdespell2/Makefile.am
+++ b/tdespell2/Makefile.am
@@ -3,7 +3,7 @@ METASOURCES = AUTO
noinst_LTLIBRARIES = libtdespell2base.la
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT -I$(top_srcdir)/tdeutils $(all_includes)
+AM_CPPFLAGS = -DKDE_NO_COMPAT -I$(top_srcdir)/tdeutils $(all_includes)
tdespell2baseincludedir = $(includedir)/tdespell2
diff --git a/tdespell2/tests/Makefile.am b/tdespell2/tests/Makefile.am
index fc94843b5..c33439d68 100644
--- a/tdespell2/tests/Makefile.am
+++ b/tdespell2/tests/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT -I$(top_srcdir)/tdespell2 -I$(top_srcdir)/tdespell2/ui $(all_includes)
+AM_CPPFLAGS = -DKDE_NO_COMPAT -I$(top_srcdir)/tdespell2 -I$(top_srcdir)/tdespell2/ui $(all_includes)
METASOURCES = AUTO
diff --git a/tdespell2/ui/Makefile.am b/tdespell2/ui/Makefile.am
index a2d3757d3..42837ec1f 100644
--- a/tdespell2/ui/Makefile.am
+++ b/tdespell2/ui/Makefile.am
@@ -4,7 +4,7 @@ lib_LTLIBRARIES = libtdespell2.la
# Put most of the code in a noinst lib, for the unit tests to be able to use internal classes.
noinst_LTLIBRARIES = libtdespell2_noinst.la
-KDE_CXXFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT
+KDE_CXXFLAGS = -DKDE_NO_COMPAT
INCLUDES = -I$(top_srcdir)/tdespell2 $(all_includes)
tdespell2includedir = $(includedir)/tdespell2
diff --git a/tdewallet/tests/CMakeLists.txt b/tdewallet/tests/CMakeLists.txt
index 9c64ac9af..5d75f8d70 100644
--- a/tdewallet/tests/CMakeLists.txt
+++ b/tdewallet/tests/CMakeLists.txt
@@ -26,7 +26,6 @@ link_directories(
add_definitions (
-DKDE_NO_COMPAT
- -DTQT_NO_COMPAT
-DTQT_NO_ASCII_CAST
)
diff --git a/tdewallet/tests/Makefile.am b/tdewallet/tests/Makefile.am
index 085c0630e..0f8ad9946 100644
--- a/tdewallet/tests/Makefile.am
+++ b/tdewallet/tests/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT -DTQT_NO_ASCII_CAST $(all_includes)
+AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_ASCII_CAST $(all_includes)
METASOURCES = AUTO
check_PROGRAMS = tdewalletasync tdewalletsync tdewalletboth
diff --git a/win/pro_files/tdemdi/test/test.pro b/win/pro_files/tdemdi/test/test.pro
index 62b30c186..757be67fb 100644
--- a/win/pro_files/tdemdi/test/test.pro
+++ b/win/pro_files/tdemdi/test/test.pro
@@ -9,7 +9,7 @@ CONFIG -= windows
CONFIG += debug
CONFIG += console
-unix:DEFINES = NO_INCLUDE_MOCFILES TQT_NO_COMPAT
+unix:DEFINES = NO_INCLUDE_MOCFILES
unix:LIBS += -ltdemdi -L$(TDEDIR)/lib -ltdecore -ltdeui -lDCOP -ltdeparts
unix:INCLUDEPATH += . .. $(TDEDIR)/include