Revert "Allow moc to handle symbols that have been redefined."

[profile/ivi/qtbase.git] / src / corelib / kernel / qobjectdefs.h

diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h
index 306728d..e840706 100644 (file)
--- a/src/corelib/kernel/qobjectdefs.h
+++ b/src/corelib/kernel/qobjectdefs.h
@@ -213,16 +213,16 @@ Q_CORE_EXPORT const char *qFlagLocation(const char *method);
 #ifndef QT_NO_DEBUG
 # define QLOCATION "\0" __FILE__ ":" QTOSTRING(__LINE__)
 # ifndef QT_NO_KEYWORDS
-#  define METHOD(a)   qFlagLocation("0" QTOSTRING(a) QLOCATION)
+#  define METHOD(a)   qFlagLocation("0"#a QLOCATION)
 # endif
-# define SLOT(a)     qFlagLocation("1" QTOSTRING(a) QLOCATION)
-# define SIGNAL(a)   qFlagLocation("2" QTOSTRING(a) QLOCATION)
+# define SLOT(a)     qFlagLocation("1"#a QLOCATION)
+# define SIGNAL(a)   qFlagLocation("2"#a QLOCATION)
 #else
 # ifndef QT_NO_KEYWORDS
-#  define METHOD(a)   "0" QTOSTRING(a)
+#  define METHOD(a)   "0"#a
 # endif
-# define SLOT(a)     "1" QTOSTRING(a)
-# define SIGNAL(a)   "2" QTOSTRING(a)
+# define SLOT(a)     "1"#a
+# define SIGNAL(a)   "2"#a
 #endif
 
 #define QMETHOD_CODE  0                        // member type codes