diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 14:31:47 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 14:31:47 +0100 |
| commit | 0655209fdad022bd0f6eb20ce85522cb56506bf0 (patch) | |
| tree | cdba0c1590655f5cb75a68cedff74f8a683db3a2 /src/qml/qml/qqmlmetatype.cpp | |
| parent | c3babc03c99c6ca5fa210486e133eb456a405bab (diff) | |
| parent | 3d8f103c2641f35e7681485102a1b59886db8934 (diff) | |
Merge master into api_changes
Conflicts:
src/qml/qml/qqmlboundsignal.cpp
src/qml/qml/qqmlpropertycache.cpp
Change-Id: I5193a193fa301c0b518291645bf626a5fa07118f
Diffstat (limited to 'src/qml/qml/qqmlmetatype.cpp')
| -rw-r--r-- | src/qml/qml/qqmlmetatype.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlmetatype.cpp b/src/qml/qml/qqmlmetatype.cpp index 5b80f57d01..4af08c28bf 100644 --- a/src/qml/qml/qqmlmetatype.cpp +++ b/src/qml/qml/qqmlmetatype.cpp @@ -512,7 +512,7 @@ QObject *QQmlType::create() const d->m_newFunc(rv); if (rv && !d->m_metaObjects.isEmpty()) - (void *)new QQmlProxyMetaObject(rv, &d->m_metaObjects); + (void)new QQmlProxyMetaObject(rv, &d->m_metaObjects); return rv; } @@ -525,7 +525,7 @@ void QQmlType::create(QObject **out, void **memory, size_t additionalMemory) con d->m_newFunc(rv); if (rv && !d->m_metaObjects.isEmpty()) - (void *)new QQmlProxyMetaObject(rv, &d->m_metaObjects); + (void)new QQmlProxyMetaObject(rv, &d->m_metaObjects); *out = rv; *memory = ((char *)rv) + d->m_allocationSize; |