From f7dd01f5dfb46bffee919fa50193f895fe7a4a83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Tue, 17 Aug 2010 16:24:52 +0200 Subject: Workaround what seems to be a compiler parser bug The workaround seems harmless, otherwise. Maybe even standard-compliant (14.2.4 [temp.names]) $ gcc --version sbox-arm-none-linux-gnueabi-gcc (cs2009q1-eglibc2.8-armv7) 4.3.3 Copyright (C) 2008 Free Software Foundation, Inc. Reviewed-by: Olivier Goffart --- src/corelib/kernel/qvariant.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 inline QT_DEPRECATED bool qVariantCanConvert(const QVariant &variant) -{ return variant.canConvert(); } +{ return variant.template canConvert(); } #endif #endif -- cgit v0.12 From 45e5a8f65cff46088608eff55196693c48502651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Tue, 17 Aug 2010 16:36:17 +0200 Subject: Q_CHECK_PTR should issue qFatal with QT_NO_EXCEPTIONS Allowing the null pointer to propagate seems to be a bigger evil and could potentially become a security risk. Task-number: QT-3785 Reviewed-by: Peter Hartmann Reviewed-by: Olivier Goffart Reviewed-by: Thiago Macieira --- src/corelib/global/qglobal.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v0.12