diff --git a/kopete/kopete/chatwindow/tests/Makefile.am b/kopete/kopete/chatwindow/tests/Makefile.am
index cb5b1e45..d2a7442c 100644
--- a/kopete/kopete/chatwindow/tests/Makefile.am
+++ b/kopete/kopete/chatwindow/tests/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_ASCII_CAST -DQT_NO_COMPAT \
+AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_ASCII_CAST -DTQT_NO_COMPAT \
 	$(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/kopete/chatwindow -I$(top_srcdir)/kopete/libkopete $(all_includes) -DSRCDIR=\"$(top_srcdir)/kopete/kopete/chatwindow/tests\"
 METASOURCES = AUTO
 check_LTLIBRARIES = tdeunittest_chatwindowstyle_test.la tdeunittest_chatwindowstylerendering_test.la
diff --git a/kopete/kopete/tdeconf_update/Makefile.am b/kopete/kopete/tdeconf_update/Makefile.am
index 76221dbc..63dfcd8c 100644
--- a/kopete/kopete/tdeconf_update/Makefile.am
+++ b/kopete/kopete/tdeconf_update/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT $(all_includes)
+AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT $(all_includes)
 
 update_DATA = kopete-pluginloader.upd kopete-account-tdeconf_update.upd \
 	kopete-pluginloader2.upd kopete-jabberproxytype-tdeconf_update.upd \
diff --git a/kopete/libkopete/Makefile.am b/kopete/libkopete/Makefile.am
index c227fa99..04cd3cfd 100644
--- a/kopete/libkopete/Makefile.am
+++ b/kopete/libkopete/Makefile.am
@@ -13,7 +13,7 @@ SUBDIRS = $(COMPAT_DIR) private ui . avdevice
 
 METASOURCES = AUTO
 
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT \
+AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT \
 	$(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/libkopete/private \
 	-I$(top_srcdir)/kopete/libkopete/ui $(all_includes)
 
diff --git a/kopete/libkopete/avdevice/Makefile.am b/kopete/libkopete/avdevice/Makefile.am
index a968ae84..75e57c1c 100644
--- a/kopete/libkopete/avdevice/Makefile.am
+++ b/kopete/libkopete/avdevice/Makefile.am
@@ -1,5 +1,5 @@
 INCLUDES =$(GLINC) $(all_includes)
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -DQT_NO_CAST_ASCII -DQT_NO_ASCII_CAST \
+AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT -DQT_NO_CAST_ASCII -DTQT_NO_ASCII_CAST \
         $(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/libkopete/private \
         -I$(top_srcdir)/kopete/libkopete/ui $(all_includes)
 METASOURCES = AUTO
diff --git a/kopete/libkopete/private/Makefile.am b/kopete/libkopete/private/Makefile.am
index 3dc2ca73..313de132 100644
--- a/kopete/libkopete/private/Makefile.am
+++ b/kopete/libkopete/private/Makefile.am
@@ -1,6 +1,6 @@
 METASOURCES = AUTO
 
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -DQT_NO_CAST_ASCII -DQT_NO_ASCII_CAST \
+AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT -DQT_NO_CAST_ASCII -DTQT_NO_ASCII_CAST \
 	$(KOPETE_INCLUDES) $(all_includes)
 
 noinst_LTLIBRARIES = libkopeteprivate.la
diff --git a/kopete/libkopete/tests/Makefile.am b/kopete/libkopete/tests/Makefile.am
index 3bb06d3d..70281a1b 100644
--- a/kopete/libkopete/tests/Makefile.am
+++ b/kopete/libkopete/tests/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS = mock .
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_ASCII_CAST -DQT_NO_COMPAT \
+AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_ASCII_CAST -DTQT_NO_COMPAT \
 	$(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/libkopete/private -I$(top_srcdir)/kopete/libkopete/private -I$(top_srcdir)/kopete/libkopete/tests/mock $(all_includes) -DSRCDIR=\"$(top_srcdir)/kopete/libkopete/tests\"
 METASOURCES = AUTO
 
diff --git a/kopete/libkopete/tests/mock/Makefile.am b/kopete/libkopete/tests/mock/Makefile.am
index 72102048..349273dd 100644
--- a/kopete/libkopete/tests/mock/Makefile.am
+++ b/kopete/libkopete/tests/mock/Makefile.am
@@ -1,5 +1,5 @@
 METASOURCES = AUTO
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -DQT_NO_CAST_ASCII -DQT_NO_ASCII_CAST \
+AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT -DQT_NO_CAST_ASCII -DTQT_NO_ASCII_CAST \
 	$(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/libkopete/private $(all_includes)
 
 noinst_LTLIBRARIES = libkopete_mock.la
diff --git a/kopete/libkopete/ui/Makefile.am b/kopete/libkopete/ui/Makefile.am
index 4c2c4d02..35c10844 100644
--- a/kopete/libkopete/ui/Makefile.am
+++ b/kopete/libkopete/ui/Makefile.am
@@ -1,5 +1,5 @@
 METASOURCES = AUTO
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT \
+AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT \
 	$(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/libkopete/private $(all_includes)
 
 noinst_LTLIBRARIES = libkopeteui.la
diff --git a/ksirc/KSOpenkSirc/Makefile.am b/ksirc/KSOpenkSirc/Makefile.am
index 3af4d5f2..b068fe12 100644
--- a/ksirc/KSOpenkSirc/Makefile.am
+++ b/ksirc/KSOpenkSirc/Makefile.am
@@ -1,4 +1,4 @@
-KDE_CXXFLAGS = $(USE_RTTI) $(USE_EXCEPTIONS) -UQT_NO_ASCII_CAST
+KDE_CXXFLAGS = $(USE_RTTI) $(USE_EXCEPTIONS) -UTQT_NO_ASCII_CAST
 
 # set the include path for X, qt and KDE
 INCLUDES= $(all_includes)
diff --git a/ksirc/Makefile.am b/ksirc/Makefile.am
index 1396d9bc..5bb6b3ee 100644
--- a/ksirc/Makefile.am
+++ b/ksirc/Makefile.am
@@ -1,5 +1,5 @@
 
-KDE_CXXFLAGS = $(USE_RTTI) $(USE_EXCEPTIONS)# -UQT_NO_ASCII_CAST
+KDE_CXXFLAGS = $(USE_RTTI) $(USE_EXCEPTIONS)# -UTQT_NO_ASCII_CAST
 
 # set the include path for X, qt and KDE
 INCLUDES= -IKSOpenkSirc -IKSPrefs $(all_includes)
diff --git a/ksirc/puke/Makefile.am b/ksirc/puke/Makefile.am
index 4fbf90d2..90804079 100644
--- a/ksirc/puke/Makefile.am
+++ b/ksirc/puke/Makefile.am
@@ -1,4 +1,4 @@
-KDE_CXXFLAGS = $(USE_RTTI) $(USE_EXCEPTIONS) -UQT_NO_ASCII_CAST
+KDE_CXXFLAGS = $(USE_RTTI) $(USE_EXCEPTIONS) -UTQT_NO_ASCII_CAST
 
 INCLUDES= $(all_includes)