diff --git a/koffice-i18n-bg/acinclude.m4 b/koffice-i18n-bg/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-bg/acinclude.m4
+++ b/koffice-i18n-bg/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-ca/acinclude.m4 b/koffice-i18n-ca/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-ca/acinclude.m4
+++ b/koffice-i18n-ca/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-cs/acinclude.m4 b/koffice-i18n-cs/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-cs/acinclude.m4
+++ b/koffice-i18n-cs/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-cy/acinclude.m4 b/koffice-i18n-cy/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-cy/acinclude.m4
+++ b/koffice-i18n-cy/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-da/acinclude.m4 b/koffice-i18n-da/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-da/acinclude.m4
+++ b/koffice-i18n-da/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-de/acinclude.m4 b/koffice-i18n-de/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-de/acinclude.m4
+++ b/koffice-i18n-de/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-el/acinclude.m4 b/koffice-i18n-el/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-el/acinclude.m4
+++ b/koffice-i18n-el/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-en_GB/acinclude.m4 b/koffice-i18n-en_GB/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-en_GB/acinclude.m4
+++ b/koffice-i18n-en_GB/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-es/acinclude.m4 b/koffice-i18n-es/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-es/acinclude.m4
+++ b/koffice-i18n-es/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-et/acinclude.m4 b/koffice-i18n-et/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-et/acinclude.m4
+++ b/koffice-i18n-et/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-eu/acinclude.m4 b/koffice-i18n-eu/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-eu/acinclude.m4
+++ b/koffice-i18n-eu/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-fa/acinclude.m4 b/koffice-i18n-fa/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-fa/acinclude.m4
+++ b/koffice-i18n-fa/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-fi/acinclude.m4 b/koffice-i18n-fi/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-fi/acinclude.m4
+++ b/koffice-i18n-fi/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-fr/acinclude.m4 b/koffice-i18n-fr/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-fr/acinclude.m4
+++ b/koffice-i18n-fr/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-ga/acinclude.m4 b/koffice-i18n-ga/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-ga/acinclude.m4
+++ b/koffice-i18n-ga/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-gl/acinclude.m4 b/koffice-i18n-gl/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-gl/acinclude.m4
+++ b/koffice-i18n-gl/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-hu/acinclude.m4 b/koffice-i18n-hu/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-hu/acinclude.m4
+++ b/koffice-i18n-hu/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-it/acinclude.m4 b/koffice-i18n-it/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-it/acinclude.m4
+++ b/koffice-i18n-it/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-ja/acinclude.m4 b/koffice-i18n-ja/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-ja/acinclude.m4
+++ b/koffice-i18n-ja/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-km/acinclude.m4 b/koffice-i18n-km/acinclude.m4
index 81b3ee6a..f5da0579 100644
--- a/koffice-i18n-km/acinclude.m4
+++ b/koffice-i18n-km/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-lv/acinclude.m4 b/koffice-i18n-lv/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-lv/acinclude.m4
+++ b/koffice-i18n-lv/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-ms/acinclude.m4 b/koffice-i18n-ms/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-ms/acinclude.m4
+++ b/koffice-i18n-ms/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-nb/acinclude.m4 b/koffice-i18n-nb/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-nb/acinclude.m4
+++ b/koffice-i18n-nb/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-nds/acinclude.m4 b/koffice-i18n-nds/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-nds/acinclude.m4
+++ b/koffice-i18n-nds/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-ne/acinclude.m4 b/koffice-i18n-ne/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-ne/acinclude.m4
+++ b/koffice-i18n-ne/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-nl/acinclude.m4 b/koffice-i18n-nl/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-nl/acinclude.m4
+++ b/koffice-i18n-nl/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-pl/acinclude.m4 b/koffice-i18n-pl/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-pl/acinclude.m4
+++ b/koffice-i18n-pl/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-pt/acinclude.m4 b/koffice-i18n-pt/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-pt/acinclude.m4
+++ b/koffice-i18n-pt/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-pt_BR/acinclude.m4 b/koffice-i18n-pt_BR/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-pt_BR/acinclude.m4
+++ b/koffice-i18n-pt_BR/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-ru/acinclude.m4 b/koffice-i18n-ru/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-ru/acinclude.m4
+++ b/koffice-i18n-ru/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-sk/acinclude.m4 b/koffice-i18n-sk/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-sk/acinclude.m4
+++ b/koffice-i18n-sk/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-sl/acinclude.m4 b/koffice-i18n-sl/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-sl/acinclude.m4
+++ b/koffice-i18n-sl/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-sr/acinclude.m4 b/koffice-i18n-sr/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-sr/acinclude.m4
+++ b/koffice-i18n-sr/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-sr@Latn/acinclude.m4 b/koffice-i18n-sr@Latn/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-sr@Latn/acinclude.m4
+++ b/koffice-i18n-sr@Latn/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-sv/acinclude.m4 b/koffice-i18n-sv/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-sv/acinclude.m4
+++ b/koffice-i18n-sv/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-tr/acinclude.m4 b/koffice-i18n-tr/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-tr/acinclude.m4
+++ b/koffice-i18n-tr/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-uk/acinclude.m4 b/koffice-i18n-uk/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-uk/acinclude.m4
+++ b/koffice-i18n-uk/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-zh_CN/acinclude.m4 b/koffice-i18n-zh_CN/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-zh_CN/acinclude.m4
+++ b/koffice-i18n-zh_CN/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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/koffice-i18n-zh_TW/acinclude.m4 b/koffice-i18n-zh_TW/acinclude.m4
index ec590189..d07e6394 100644
--- a/koffice-i18n-zh_TW/acinclude.m4
+++ b/koffice-i18n-zh_TW/acinclude.m4
@@ -1296,7 +1296,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],
@@ -1556,10 +1556,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
@@ -1570,7 +1570,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