diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-11-22 00:00:12 (GMT) |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-11-22 00:00:12 (GMT) |
| commit | 93e86e8eb49e15ef33d080264f13e928a594a83b (patch) | |
| tree | dec23f1ea78a2d57f2cfcf69f3ed34c1efd7a967 /src | |
| parent | aaf0771576b7b11d4931f60a5469e7022739e321 (diff) | |
| parent | c70a08da7112d444268eec75421a9a840f6c8c9a (diff) | |
| download | Qt-93e86e8eb49e15ef33d080264f13e928a594a83b.zip Qt-93e86e8eb49e15ef33d080264f13e928a594a83b.tar.gz Qt-93e86e8eb49e15ef33d080264f13e928a594a83b.tar.bz2 | |
Merge branch '4.8-upstream' into master-water
Diffstat (limited to 'src')
| -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 |