summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-09-27 17:59:08 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2018-09-27 17:59:08 +0900
commit6658576e27c5fb66f4732a216be5b4f3771c6f36 (patch)
treebbd59de72b465ddc7a2185e2611a93a22abd282b
parenta615469e90c89c23000bd7c2f2905744123ac728 (diff)
downloadtdesdk-6658576e27c5fb66f4732a216be5b4f3771c6f36.zip
tdesdk-6658576e27c5fb66f4732a216be5b4f3771c6f36.tar.gz
qt -> tqt conversion:
QT_NO_ASCII_CAST -> TQT_NO_ASCII_CAST QT_NO_STL -> TQT_NO_STL QT_NO_COMPAT -> TQT_NO_COMPAT QT_NO_TRANSLATION -> TQT_NO_TRANSLATION Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--doc/scripts/man-fixincludes.1.docbook2
-rw-r--r--kmtrace/Makefile.am2
-rw-r--r--scripts/fixkdeincludes2
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/scripts/man-fixincludes.1.docbook b/doc/scripts/man-fixincludes.1.docbook
index a4850dd..a773cf7 100644
--- a/doc/scripts/man-fixincludes.1.docbook
+++ b/doc/scripts/man-fixincludes.1.docbook
@@ -62,7 +62,7 @@ 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>-UQT_NO_COMPAT</option> or
+<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 99b8feb..b83403d 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 = -DQT_NO_ASCII_CAST -UQT_NO_COMPAT -O3
+AM_CPPFLAGS = -DTQT_NO_ASCII_CAST -UTQT_NO_COMPAT -O3
LDADD = $(LIB_TDECORE) -liberty
INCLUDES = $(all_includes)
diff --git a/scripts/fixkdeincludes b/scripts/fixkdeincludes
index 4d4b7d5..c66d915 100644
--- a/scripts/fixkdeincludes
+++ b/scripts/fixkdeincludes
@@ -736,7 +736,7 @@ foreach $dir(@dirlist) {
# check if this directory wants not to be fixed
if(open(M, "$dir/Makefile.am")) {
- my @mcontents = grep /(\-UQT_NO_COMPAT|\-UKDE_NO_COMPAT)/, <M>;
+ my @mcontents = grep /(\-UTQT_NO_COMPAT|\-UKDE_NO_COMPAT)/, <M>;
close(M);
if ( @mcontents ) {
print "Skipping directory: $dir\n";