diff --git a/koffice-i18n-bg/acinclude.m4 b/koffice-i18n-bg/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-bg/acinclude.m4
+++ b/koffice-i18n-bg/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-ca/acinclude.m4 b/koffice-i18n-ca/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-ca/acinclude.m4
+++ b/koffice-i18n-ca/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-cs/acinclude.m4 b/koffice-i18n-cs/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-cs/acinclude.m4
+++ b/koffice-i18n-cs/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-cy/acinclude.m4 b/koffice-i18n-cy/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-cy/acinclude.m4
+++ b/koffice-i18n-cy/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-da/acinclude.m4 b/koffice-i18n-da/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-da/acinclude.m4
+++ b/koffice-i18n-da/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-de/acinclude.m4 b/koffice-i18n-de/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-de/acinclude.m4
+++ b/koffice-i18n-de/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-el/acinclude.m4 b/koffice-i18n-el/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-el/acinclude.m4
+++ b/koffice-i18n-el/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-en_GB/acinclude.m4 b/koffice-i18n-en_GB/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-en_GB/acinclude.m4
+++ b/koffice-i18n-en_GB/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-es/acinclude.m4 b/koffice-i18n-es/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-es/acinclude.m4
+++ b/koffice-i18n-es/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-et/acinclude.m4 b/koffice-i18n-et/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-et/acinclude.m4
+++ b/koffice-i18n-et/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-eu/acinclude.m4 b/koffice-i18n-eu/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-eu/acinclude.m4
+++ b/koffice-i18n-eu/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-fa/acinclude.m4 b/koffice-i18n-fa/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-fa/acinclude.m4
+++ b/koffice-i18n-fa/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-fi/acinclude.m4 b/koffice-i18n-fi/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-fi/acinclude.m4
+++ b/koffice-i18n-fi/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-fr/acinclude.m4 b/koffice-i18n-fr/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-fr/acinclude.m4
+++ b/koffice-i18n-fr/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-ga/acinclude.m4 b/koffice-i18n-ga/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-ga/acinclude.m4
+++ b/koffice-i18n-ga/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-gl/acinclude.m4 b/koffice-i18n-gl/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-gl/acinclude.m4
+++ b/koffice-i18n-gl/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-hu/acinclude.m4 b/koffice-i18n-hu/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-hu/acinclude.m4
+++ b/koffice-i18n-hu/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-it/acinclude.m4 b/koffice-i18n-it/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-it/acinclude.m4
+++ b/koffice-i18n-it/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-ja/acinclude.m4 b/koffice-i18n-ja/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-ja/acinclude.m4
+++ b/koffice-i18n-ja/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-km/acinclude.m4 b/koffice-i18n-km/acinclude.m4
index fa27d783..ab8a91cc 100644
--- a/koffice-i18n-km/acinclude.m4
+++ b/koffice-i18n-km/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-lv/acinclude.m4 b/koffice-i18n-lv/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-lv/acinclude.m4
+++ b/koffice-i18n-lv/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-ms/acinclude.m4 b/koffice-i18n-ms/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-ms/acinclude.m4
+++ b/koffice-i18n-ms/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-nb/acinclude.m4 b/koffice-i18n-nb/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-nb/acinclude.m4
+++ b/koffice-i18n-nb/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-nds/acinclude.m4 b/koffice-i18n-nds/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-nds/acinclude.m4
+++ b/koffice-i18n-nds/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-ne/acinclude.m4 b/koffice-i18n-ne/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-ne/acinclude.m4
+++ b/koffice-i18n-ne/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-nl/acinclude.m4 b/koffice-i18n-nl/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-nl/acinclude.m4
+++ b/koffice-i18n-nl/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-pl/acinclude.m4 b/koffice-i18n-pl/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-pl/acinclude.m4
+++ b/koffice-i18n-pl/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-pt/acinclude.m4 b/koffice-i18n-pt/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-pt/acinclude.m4
+++ b/koffice-i18n-pt/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-pt_BR/acinclude.m4 b/koffice-i18n-pt_BR/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-pt_BR/acinclude.m4
+++ b/koffice-i18n-pt_BR/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-ru/acinclude.m4 b/koffice-i18n-ru/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-ru/acinclude.m4
+++ b/koffice-i18n-ru/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-sk/acinclude.m4 b/koffice-i18n-sk/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-sk/acinclude.m4
+++ b/koffice-i18n-sk/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-sl/acinclude.m4 b/koffice-i18n-sl/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-sl/acinclude.m4
+++ b/koffice-i18n-sl/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-sr/acinclude.m4 b/koffice-i18n-sr/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-sr/acinclude.m4
+++ b/koffice-i18n-sr/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-sr@Latn/acinclude.m4 b/koffice-i18n-sr@Latn/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-sr@Latn/acinclude.m4
+++ b/koffice-i18n-sr@Latn/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-sv/acinclude.m4 b/koffice-i18n-sv/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-sv/acinclude.m4
+++ b/koffice-i18n-sv/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-tr/acinclude.m4 b/koffice-i18n-tr/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-tr/acinclude.m4
+++ b/koffice-i18n-tr/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-uk/acinclude.m4 b/koffice-i18n-uk/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-uk/acinclude.m4
+++ b/koffice-i18n-uk/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-zh_CN/acinclude.m4 b/koffice-i18n-zh_CN/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-zh_CN/acinclude.m4
+++ b/koffice-i18n-zh_CN/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else
diff --git a/koffice-i18n-zh_TW/acinclude.m4 b/koffice-i18n-zh_TW/acinclude.m4
index 9e2ceca1..d14ce366 100644
--- a/koffice-i18n-zh_TW/acinclude.m4
+++ b/koffice-i18n-zh_TW/acinclude.m4
@@ -1333,7 +1333,7 @@ KDE_MT_LIBS=
 if test "x$kde_use_qt_mt" = "xyes"; then
   KDE_CHECK_THREADING
   if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+    CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
     KDE_MT_LDFLAGS="$USE_THREADS"
     KDE_MT_LIBS="$LIBPTHREAD"
   else