diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-19 09:44:18 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-19 09:44:18 (GMT) |
| commit | 0ff8ab987f70980671cb0d041d0d0d2ad1f64b23 (patch) | |
| tree | b3c049942adda36ba2d894db1b4882940492884f | |
| parent | ffbce9839f8be5c2f21cc66b617dbeb0a47af269 (diff) | |
| parent | 45e5a8f65cff46088608eff55196693c48502651 (diff) | |
| download | Qt-0ff8ab987f70980671cb0d041d0d0d2ad1f64b23.zip Qt-0ff8ab987f70980671cb0d041d0d0d2ad1f64b23.tar.gz Qt-0ff8ab987f70980671cb0d041d0d0d2ad1f64b23.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:
Q_CHECK_PTR should issue qFatal with QT_NO_EXCEPTIONS
Workaround what seems to be a compiler parser bug
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qvariant.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index af35316..b782c9e 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1984,7 +1984,7 @@ QSysInfo::SymbianVersion QSysInfo::symbianVersion() */ void qt_check_pointer(const char *n, int l) { - qWarning("In file %s, line %d: Out of memory", n, l); + qFatal("In file %s, line %d: Out of memory", n, l); } /* \internal diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index 432b708..a4d45f6 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -589,7 +589,7 @@ inline QT_DEPRECATED T qVariantValue(const QVariant &variant) template<typename T> inline QT_DEPRECATED bool qVariantCanConvert(const QVariant &variant) -{ return variant.canConvert<T>(); } +{ return variant.template canConvert<T>(); } #endif #endif |