diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-09 17:28:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-09 17:28:53 (GMT) |
| commit | 40c018c7a0c8e95fcf928a6c1ce5301f16ffa5e3 (patch) | |
| tree | ae81752150551e52207add26de6a3b142be060b7 /src/corelib/kernel/qobject_p.h | |
| parent | e06d011cc08de370ece3b0c324b0a735a2625820 (diff) | |
| parent | 4029da6fae201512b15f1e088bf720b0c37e1437 (diff) | |
| download | Qt-40c018c7a0c8e95fcf928a6c1ce5301f16ffa5e3.zip Qt-40c018c7a0c8e95fcf928a6c1ce5301f16ffa5e3.tar.gz Qt-40c018c7a0c8e95fcf928a6c1ce5301f16ffa5e3.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:
update Browser.qml to run again
Update Autotests
Probably fix compile on windows
Fix typo in docs
Probably fix compile
Fix qdeclarativevaluetype::font() autotest
Initialize member variable in QDeclarativeGridViewAttached
Handle itemsInserted/Removed/Moved() correctly for repeater.
Add QML support for methods returning QList<QObject *>
Compile
Update configure.exe to include declarative module by default
Make QDeclarativeItem NOTIFY signals canonical
Integrate QML's object ownership with the JS collector
Remove unused data member.
Fix warning.
Fix warnings and change geometry-related functions to use reals.
When flicking with snap, bias towards moving at least one item.
Doc fix.
Diffstat (limited to 'src/corelib/kernel/qobject_p.h')
| -rw-r--r-- | src/corelib/kernel/qobject_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h index cc5bf97..20e3da1 100644 --- a/src/corelib/kernel/qobject_p.h +++ b/src/corelib/kernel/qobject_p.h @@ -90,6 +90,7 @@ class Q_CORE_EXPORT QDeclarativeData public: virtual ~QDeclarativeData(); virtual void destroyed(QObject *) = 0; + virtual void parentChanged(QObject *, QObject *) = 0; }; class Q_CORE_EXPORT QObjectPrivate : public QObjectData |