diff options
| author | hjk <qtc-committer@nokia.com> | 2011-11-21 17:53:16 (GMT) |
|---|---|---|
| committer | hjk <qthjk@ovi.com> | 2011-11-21 18:04:59 (GMT) |
| commit | 6d9bdc5038644ccef2eb2da3cd46522de5904974 (patch) | |
| tree | bb86385fbdb09a2c3e212d66a8fe9163b9c09080 /src/corelib | |
| parent | a9c3f7169faf4621d39714f753d6e8b376c5d6e5 (diff) | |
| download | Qt-6d9bdc5038644ccef2eb2da3cd46522de5904974.zip Qt-6d9bdc5038644ccef2eb2da3cd46522de5904974.tar.gz Qt-6d9bdc5038644ccef2eb2da3cd46522de5904974.tar.bz2 | |
Add spaces for string concatenation to work around C++11 source incompatibility.
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Task-number: QTBUG-22847
Diffstat (limited to 'src/corelib')
| -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 efce4d5..8cfc61a 100644 --- a/src/corelib/kernel/qobjectdefs.h +++ b/src/corelib/kernel/qobjectdefs.h @@ -219,7 +219,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 |