diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-06-11 14:42:28 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-06-11 17:36:50 +0900 |
| commit | 365f31354bad56db26993380120a4d5e26fc133d (patch) | |
| tree | f51b79739778498b9af2241881aa41452563cd3f | |
| parent | 8b02e37929a3464df986926213f548ff96e4f09d (diff) | |
| download | tdesdk-365f3135.tar.gz tdesdk-365f3135.zip | |
Drop TQT_NO_COMPAT code
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 7c1c8b9759e1beeee46f19650ca8c51fd8bc8f22)
| -rw-r--r-- | doc/man/scripts/fixkdeincludes.1 | 2 | ||||
| -rw-r--r-- | doc/scripts/man-fixincludes.1.docbook | 1 | ||||
| -rw-r--r-- | kmtrace/Makefile.am | 2 | ||||
| -rw-r--r-- | scripts/fixkdeincludes | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/doc/man/scripts/fixkdeincludes.1 b/doc/man/scripts/fixkdeincludes.1 index 6c5bea18..2a420d9d 100644 --- a/doc/man/scripts/fixkdeincludes.1 +++ b/doc/man/scripts/fixkdeincludes.1 @@ -51,7 +51,7 @@ will simply be written to standard output. The list of C++ sources to examine should be given on the command-line. If no files are given, all C++ sources in or beneath the current directory will be examined (with the exception of directories whose -\fIMakefile.am\fP contains \-UTQT_NO_COMPAT or \-UTDE_NO_COMPAT). +\fIMakefile.am\fP contains \-UTDE_NO_COMPAT). .PP This utility is part of the TDE Software Development Kit. .SH OPTIONS diff --git a/doc/scripts/man-fixincludes.1.docbook b/doc/scripts/man-fixincludes.1.docbook index a773cf7a..31c1b546 100644 --- a/doc/scripts/man-fixincludes.1.docbook +++ b/doc/scripts/man-fixincludes.1.docbook @@ -62,7 +62,6 @@ problems will simply be written to standard output. </para> command-line. If no files are given, all C++ sources in or beneath the current directory will be examined (with the exception of directories whose <filename>Makefile.am</filename> contains -<option>-UTQT_NO_COMPAT</option> or <option>-UKDE_NO_COMPAT</option>)</para> <para>This utility is part of the KDE Software Development Kit. </para> diff --git a/kmtrace/Makefile.am b/kmtrace/Makefile.am index b83403dc..1056813d 100644 --- a/kmtrace/Makefile.am +++ b/kmtrace/Makefile.am @@ -17,7 +17,7 @@ # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. -AM_CPPFLAGS = -DTQT_NO_ASCII_CAST -UTQT_NO_COMPAT -O3 +AM_CPPFLAGS = -DTQT_NO_ASCII_CAST -O3 LDADD = $(LIB_TDECORE) -liberty INCLUDES = $(all_includes) diff --git a/scripts/fixkdeincludes b/scripts/fixkdeincludes index 96ca3d0a..6ac3f116 100644 --- a/scripts/fixkdeincludes +++ b/scripts/fixkdeincludes @@ -731,7 +731,7 @@ foreach $dir(@dirlist) { # check if this directory wants not to be fixed if(open(M, "$dir/Makefile.am")) { - my @mcontents = grep /(\-UTQT_NO_COMPAT|\-UKDE_NO_COMPAT)/, <M>; + my @mcontents = grep /\-UKDE_NO_COMPAT/, <M>; close(M); if ( @mcontents ) { print "Skipping directory: $dir\n"; |