diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-21 18:22:35 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-21 18:22:35 (GMT) |
| commit | c70a08da7112d444268eec75421a9a840f6c8c9a (patch) | |
| tree | 0f402d54bfebe050adaf6b9cac70567ac9c0fb55 /src/corelib | |
| parent | 75792528141ebf3dc6f36f2efcd771dfaef6e703 (diff) | |
| parent | 6d9bdc5038644ccef2eb2da3cd46522de5904974 (diff) | |
| download | Qt-c70a08da7112d444268eec75421a9a840f6c8c9a.zip Qt-c70a08da7112d444268eec75421a9a840f6c8c9a.tar.gz Qt-c70a08da7112d444268eec75421a9a840f6c8c9a.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Add spaces for string concatenation to work around C++11 source incompatibility.
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 |