diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-12 03:31:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-12 03:31:47 (GMT) |
| commit | 381ea9c22eb8f6b3701376a650202f094e17746d (patch) | |
| tree | 5c0014189bf8c14ae11ad9d246134c839c13c343 /src/gui/kernel | |
| parent | 27f8facfea87d7c4669852e7aa0fe5d9ca828eb3 (diff) | |
| parent | b6a50a14189da153e93aef581c30863608399714 (diff) | |
| download | Qt-381ea9c22eb8f6b3701376a650202f094e17746d.zip Qt-381ea9c22eb8f6b3701376a650202f094e17746d.tar.gz Qt-381ea9c22eb8f6b3701376a650202f094e17746d.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: (130 commits)
Warning
Read Maemo orientation at startup
Exclude gestures from examples autotest
Exclude proxywidgets from examples autotest
Fix crash on QScriptProgram destruction
doc fixes
Start documenting coding conventions
Adds missing qml file to qdeclarativeflipable autotest
Revert "Better reporting of extension plugin loading errors."
Doc
Fix graphicswidget auto-test.
Add Mac OS X bundle description for qml runtime
Cleanup
Disallow writes to read-only value type properties
Allow undefined to be assigned to QVariant properties
Add a Qt.isQtObject() method
Fix crash in QML library imports
Remove QT_VERSION checks in QML
List properties aren't read-only
Small doc fix.
...
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index e88026c..9353d10 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -1478,7 +1478,7 @@ QWidget::~QWidget() QObjectPrivate::clearGuards(this); if (d->declarativeData) { - d->declarativeData->destroyed(this); + QDeclarativeData::destroyed(d->declarativeData, this); d->declarativeData = 0; // don't activate again in ~QObject } |