diff options
| author | hjk <qtc-committer@nokia.com> | 2011-11-21 18:50:11 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-21 20:14:31 +0100 |
| commit | 47304c2c04e785d86cb0d366efbcc5b78d8acf55 (patch) | |
| tree | 196a84899365932b2e82f74450b558b9f3197bc5 | |
| parent | 0097d2daba0d4482090705dee6465faa0967b7d1 (diff) | |
Add spaces for string concatenation to work around C++11 source incompatibility.
Change-Id: I6acb7dca20d3bfcb24ea798c7ecd1a12464af5a6
Reviewed-by: QTBUG-22847
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rw-r--r-- | src/corelib/kernel/qobjectdefs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h index c04b66480d..31f3067829 100644 --- a/src/corelib/kernel/qobjectdefs.h +++ b/src/corelib/kernel/qobjectdefs.h @@ -213,7 +213,7 @@ Q_CORE_EXPORT const char *qFlagLocation(const char *method); #define QTOSTRING_HELPER(s) #s #define QTOSTRING(s) QTOSTRING_HELPER(s) #ifndef QT_NO_DEBUG -# define QLOCATION "\0"__FILE__":"QTOSTRING(__LINE__) +# define QLOCATION "\0" __FILE__ ":" QTOSTRING(__LINE__) # ifndef QT_NO_KEYWORDS # define METHOD(a) qFlagLocation("0"#a QLOCATION) # endif |