summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-02-07 08:19:59 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-02-07 08:19:59 (GMT)
commitc3d1da70b272784e57dfd149dc1aec6841b1111c (patch)
tree8939ac54c104e2f2cbe0dd7277ae2a4e29195d52 /src/corelib
parent4e458b9241dbafd8d39b7bdca1ecddee8b89b39b (diff)
parent6bd233953ac87603ddee8c5f087fbe523dd3793e (diff)
downloadQt-c3d1da70b272784e57dfd149dc1aec6841b1111c.zip
Qt-c3d1da70b272784e57dfd149dc1aec6841b1111c.tar.gz
Qt-c3d1da70b272784e57dfd149dc1aec6841b1111c.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Changing header/footer size during creation caused recusion Ensure section delegates are updated when the section property changes. Make test compile Disable lineHeight test while implementing the feature in master properly. Initialize primitives when creating a new QVariant modelChanged() should not be emitted until view is repopulated AnimatedImage does not notify on status change. Clarify case preservation in QDeclarativeImageProviders Allow unknown types to be passed opaquely through signals
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/kernel/qmetatype.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
index 26249ab..8eeee30 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@@ -138,7 +138,7 @@ template <typename T>
void *qMetaTypeConstructHelper(const T *t)
{
if (!t)
- return new T;
+ return new T();
return new T(*static_cast<const T*>(t));
}