diff options
| -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 |