diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-07-03 16:06:01 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-04 00:48:44 +0200 |
| commit | 10edf63174414cc95165c4fc14a3278e944dfbe2 (patch) | |
| tree | fcf9f0cd2d4ee429a76339df7d32c00b257cbb74 /src/corelib/kernel/qobjectdefs.h | |
| parent | 0ce1574dad6f80d563c61259b4d4bff84d03b889 (diff) | |
Revert "Allow moc to handle symbols that have been redefined."
This reverts commit 5bb1408927b4eb5a03e8ab9f7cbc68f80d8a3962.
The temporary measure used to support redefinition of QtDeclarative
class names during the transition period is no longer required.
Task-number: QTBUG-24517
Change-Id: Ib90f08fcdfb02e004e594ac72b698eaa0325d98d
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/kernel/qobjectdefs.h')
| -rw-r--r-- | src/corelib/kernel/qobjectdefs.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h index 306728d77c..e840706021 100644 --- 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 |