From 6d9bdc5038644ccef2eb2da3cd46522de5904974 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 21 Nov 2011 18:53:16 +0100 Subject: Add spaces for string concatenation to work around C++11 source incompatibility. Reviewed-by: Oswald Buddenhagen Task-number: QTBUG-22847 --- src/corelib/kernel/qobjectdefs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v0.12