QT_INCLUDES => TQT_INCLUDES conversion

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

71 files changed, 355 insertions, 355 deletions

diff --git a/tde-i18n-af/acinclude.m4 b/tde-i18n-af/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-af/acinclude.m4
+++ b/tde-i18n-af/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-ar/acinclude.m4 b/tde-i18n-ar/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-ar/acinclude.m4
+++ b/tde-i18n-ar/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-az/acinclude.m4 b/tde-i18n-az/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-az/acinclude.m4
+++ b/tde-i18n-az/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-be/acinclude.m4 b/tde-i18n-be/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-be/acinclude.m4
+++ b/tde-i18n-be/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-bg/acinclude.m4 b/tde-i18n-bg/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-bg/acinclude.m4
+++ b/tde-i18n-bg/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-bn/acinclude.m4 b/tde-i18n-bn/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-bn/acinclude.m4
+++ b/tde-i18n-bn/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-br/acinclude.m4 b/tde-i18n-br/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-br/acinclude.m4
+++ b/tde-i18n-br/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-bs/acinclude.m4 b/tde-i18n-bs/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-bs/acinclude.m4
+++ b/tde-i18n-bs/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-ca/acinclude.m4 b/tde-i18n-ca/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-ca/acinclude.m4
+++ b/tde-i18n-ca/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-cs/acinclude.m4 b/tde-i18n-cs/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-cs/acinclude.m4
+++ b/tde-i18n-cs/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-csb/acinclude.m4 b/tde-i18n-csb/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-csb/acinclude.m4
+++ b/tde-i18n-csb/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-cy/acinclude.m4 b/tde-i18n-cy/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-cy/acinclude.m4
+++ b/tde-i18n-cy/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-da/acinclude.m4 b/tde-i18n-da/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-da/acinclude.m4
+++ b/tde-i18n-da/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-de/acinclude.m4 b/tde-i18n-de/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-de/acinclude.m4
+++ b/tde-i18n-de/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-el/acinclude.m4 b/tde-i18n-el/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-el/acinclude.m4
+++ b/tde-i18n-el/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-en_GB/acinclude.m4 b/tde-i18n-en_GB/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-en_GB/acinclude.m4
+++ b/tde-i18n-en_GB/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-eo/acinclude.m4 b/tde-i18n-eo/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-eo/acinclude.m4
+++ b/tde-i18n-eo/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-es/acinclude.m4 b/tde-i18n-es/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-es/acinclude.m4
+++ b/tde-i18n-es/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-et/acinclude.m4 b/tde-i18n-et/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-et/acinclude.m4
+++ b/tde-i18n-et/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-eu/acinclude.m4 b/tde-i18n-eu/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-eu/acinclude.m4
+++ b/tde-i18n-eu/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-fa/acinclude.m4 b/tde-i18n-fa/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-fa/acinclude.m4
+++ b/tde-i18n-fa/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-fi/acinclude.m4 b/tde-i18n-fi/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-fi/acinclude.m4
+++ b/tde-i18n-fi/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-fr/acinclude.m4 b/tde-i18n-fr/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-fr/acinclude.m4
+++ b/tde-i18n-fr/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-fy/acinclude.m4 b/tde-i18n-fy/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-fy/acinclude.m4
+++ b/tde-i18n-fy/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-ga/acinclude.m4 b/tde-i18n-ga/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-ga/acinclude.m4
+++ b/tde-i18n-ga/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-gl/acinclude.m4 b/tde-i18n-gl/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-gl/acinclude.m4
+++ b/tde-i18n-gl/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-he/acinclude.m4 b/tde-i18n-he/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-he/acinclude.m4
+++ b/tde-i18n-he/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-hi/acinclude.m4 b/tde-i18n-hi/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-hi/acinclude.m4
+++ b/tde-i18n-hi/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-hr/acinclude.m4 b/tde-i18n-hr/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-hr/acinclude.m4
+++ b/tde-i18n-hr/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-hu/acinclude.m4 b/tde-i18n-hu/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-hu/acinclude.m4
+++ b/tde-i18n-hu/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-is/acinclude.m4 b/tde-i18n-is/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-is/acinclude.m4
+++ b/tde-i18n-is/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-it/acinclude.m4 b/tde-i18n-it/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-it/acinclude.m4
+++ b/tde-i18n-it/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-ja/acinclude.m4 b/tde-i18n-ja/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-ja/acinclude.m4
+++ b/tde-i18n-ja/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-kk/acinclude.m4 b/tde-i18n-kk/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-kk/acinclude.m4
+++ b/tde-i18n-kk/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-km/acinclude.m4 b/tde-i18n-km/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-km/acinclude.m4
+++ b/tde-i18n-km/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-ko/acinclude.m4 b/tde-i18n-ko/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-ko/acinclude.m4
+++ b/tde-i18n-ko/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-lt/acinclude.m4 b/tde-i18n-lt/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-lt/acinclude.m4
+++ b/tde-i18n-lt/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-lv/acinclude.m4 b/tde-i18n-lv/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-lv/acinclude.m4
+++ b/tde-i18n-lv/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-mk/acinclude.m4 b/tde-i18n-mk/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-mk/acinclude.m4
+++ b/tde-i18n-mk/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-mn/acinclude.m4 b/tde-i18n-mn/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-mn/acinclude.m4
+++ b/tde-i18n-mn/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-ms/acinclude.m4 b/tde-i18n-ms/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-ms/acinclude.m4
+++ b/tde-i18n-ms/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-nb/acinclude.m4 b/tde-i18n-nb/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-nb/acinclude.m4
+++ b/tde-i18n-nb/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-nds/acinclude.m4 b/tde-i18n-nds/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-nds/acinclude.m4
+++ b/tde-i18n-nds/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-nl/acinclude.m4 b/tde-i18n-nl/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-nl/acinclude.m4
+++ b/tde-i18n-nl/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-nn/acinclude.m4 b/tde-i18n-nn/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-nn/acinclude.m4
+++ b/tde-i18n-nn/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-pa/acinclude.m4 b/tde-i18n-pa/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-pa/acinclude.m4
+++ b/tde-i18n-pa/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-pl/acinclude.m4 b/tde-i18n-pl/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-pl/acinclude.m4
+++ b/tde-i18n-pl/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-pt/acinclude.m4 b/tde-i18n-pt/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-pt/acinclude.m4
+++ b/tde-i18n-pt/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-pt_BR/acinclude.m4 b/tde-i18n-pt_BR/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-pt_BR/acinclude.m4
+++ b/tde-i18n-pt_BR/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-ro/acinclude.m4 b/tde-i18n-ro/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-ro/acinclude.m4
+++ b/tde-i18n-ro/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-ru/acinclude.m4 b/tde-i18n-ru/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-ru/acinclude.m4
+++ b/tde-i18n-ru/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-rw/acinclude.m4 b/tde-i18n-rw/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-rw/acinclude.m4
+++ b/tde-i18n-rw/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-se/acinclude.m4 b/tde-i18n-se/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-se/acinclude.m4
+++ b/tde-i18n-se/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-sk/acinclude.m4 b/tde-i18n-sk/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-sk/acinclude.m4
+++ b/tde-i18n-sk/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-sl/acinclude.m4 b/tde-i18n-sl/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-sl/acinclude.m4
+++ b/tde-i18n-sl/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-sr/acinclude.m4 b/tde-i18n-sr/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-sr/acinclude.m4
+++ b/tde-i18n-sr/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-sr@Latn/acinclude.m4 b/tde-i18n-sr@Latn/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-sr@Latn/acinclude.m4
+++ b/tde-i18n-sr@Latn/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-ss/acinclude.m4 b/tde-i18n-ss/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-ss/acinclude.m4
+++ b/tde-i18n-ss/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-sv/acinclude.m4 b/tde-i18n-sv/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-sv/acinclude.m4
+++ b/tde-i18n-sv/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-ta/acinclude.m4 b/tde-i18n-ta/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-ta/acinclude.m4
+++ b/tde-i18n-ta/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-te/acinclude.m4 b/tde-i18n-te/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-te/acinclude.m4
+++ b/tde-i18n-te/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-tg/acinclude.m4 b/tde-i18n-tg/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-tg/acinclude.m4
+++ b/tde-i18n-tg/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-th/acinclude.m4 b/tde-i18n-th/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-th/acinclude.m4
+++ b/tde-i18n-th/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-tr/acinclude.m4 b/tde-i18n-tr/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-tr/acinclude.m4
+++ b/tde-i18n-tr/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-uk/acinclude.m4 b/tde-i18n-uk/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-uk/acinclude.m4
+++ b/tde-i18n-uk/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-uz/acinclude.m4 b/tde-i18n-uz/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-uz/acinclude.m4
+++ b/tde-i18n-uz/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-uz@cyrillic/acinclude.m4 b/tde-i18n-uz@cyrillic/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-uz@cyrillic/acinclude.m4
+++ b/tde-i18n-uz@cyrillic/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-vi/acinclude.m4 b/tde-i18n-vi/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-vi/acinclude.m4
+++ b/tde-i18n-vi/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-wa/acinclude.m4 b/tde-i18n-wa/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-wa/acinclude.m4
+++ b/tde-i18n-wa/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-zh_CN/acinclude.m4 b/tde-i18n-zh_CN/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-zh_CN/acinclude.m4
+++ b/tde-i18n-zh_CN/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC
 
diff --git a/tde-i18n-zh_TW/acinclude.m4 b/tde-i18n-zh_TW/acinclude.m4
index 79d67d31be6..4b0c0ef82ae 100644
--- a/tde-i18n-zh_TW/acinclude.m4
+++ b/tde-i18n-zh_TW/acinclude.m4
@@ -1304,7 +1304,7 @@ fi
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1580,10 +1580,10 @@ AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
 else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
 fi
 
 if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1594,7 +1594,7 @@ else
 fi
 test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_TQT_MOC_UIC