diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-08-31 07:56:11 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-08-31 07:56:11 (GMT) |
| commit | 07095fe95200112ba14bf728148d03f579940c28 (patch) | |
| tree | 47f320950ed6b9cf6a50450a847beb16b0d97ae7 /src | |
| parent | 868ec6b758ad37ac7c977264561ce3052e39685d (diff) | |
| download | Qt-07095fe95200112ba14bf728148d03f579940c28.zip Qt-07095fe95200112ba14bf728148d03f579940c28.tar.gz Qt-07095fe95200112ba14bf728148d03f579940c28.tar.bz2 | |
Prevent calling deleteLater() from QML
QTBUG-13045
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qml/qdeclarativepropertycache.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativepropertycache.cpp b/src/declarative/qml/qdeclarativepropertycache.cpp index 1121a8d..08503c2 100644 --- a/src/declarative/qml/qdeclarativepropertycache.cpp +++ b/src/declarative/qml/qdeclarativepropertycache.cpp @@ -177,7 +177,7 @@ QDeclarativePropertyCache::Data QDeclarativePropertyCache::create(const QMetaObj } int methodCount = metaObject->methodCount(); - for (int ii = methodCount - 1; ii >= 2; --ii) { // >=2 to block the destroyed signal + for (int ii = methodCount - 1; ii >= 3; --ii) { // >=3 to block the destroyed signal and deleteLater() slot QMetaMethod m = metaObject->method(ii); if (m.access() == QMetaMethod::Private) continue; @@ -316,7 +316,7 @@ void QDeclarativePropertyCache::update(QDeclarativeEngine *engine, const QMetaOb } int methodCount = metaObject->methodCount(); - for (int ii = methodCount - 1; ii >= 2; --ii) { // >=2 to block the destroyed signal + for (int ii = methodCount - 1; ii >= 3; --ii) { // >=3 to block the destroyed signal and deleteLater() slot QMetaMethod m = metaObject->method(ii); if (m.access() == QMetaMethod::Private) continue; |