diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-07-22 05:16:17 (GMT) |
|---|---|---|
| committer | Toby Tomkins <toby.tomkins@nokia.com> | 2010-07-26 07:08:13 (GMT) |
| commit | 18a2e097f09ecd68e9ea2a2a515d9358729188c2 (patch) | |
| tree | 66edde9f77f87b28d8d59a8eae73646514373c37 /src | |
| parent | 056bbc32fd64f48851e6ad058c5e4c1372a96564 (diff) | |
| download | Qt-18a2e097f09ecd68e9ea2a2a515d9358729188c2.zip Qt-18a2e097f09ecd68e9ea2a2a515d9358729188c2.tar.gz Qt-18a2e097f09ecd68e9ea2a2a515d9358729188c2.tar.bz2 | |
Remove QDeclarativeItem::childrenChanged() signal overload
Broke signal handlers in QML
Task-number: QTBUG-12335
Reviewed-by: Aaron Kennedy
(cherry picked from commit ddb5e1eef379c7f32a594d91b00ff3514c46b62a)
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeitem.h | 1 | ||||
| -rw-r--r-- | src/s60installs/bwins/QtDeclarativeu.def | 2 | ||||
| -rw-r--r-- | src/s60installs/eabi/QtDeclarativeu.def | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.h b/src/declarative/graphicsitems/qdeclarativeitem.h index cd9b910..afb1f2e 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.h +++ b/src/declarative/graphicsitems/qdeclarativeitem.h @@ -152,7 +152,6 @@ public: Q_INVOKABLE QDeclarativeItem *childAt(qreal x, qreal y) const; Q_SIGNALS: - void childrenChanged(); void childrenRectChanged(const QRectF &); void baselineOffsetChanged(qreal); void stateChanged(const QString &); diff --git a/src/s60installs/bwins/QtDeclarativeu.def b/src/s60installs/bwins/QtDeclarativeu.def index 8fdd72c..2cc80a8 100644 --- a/src/s60installs/bwins/QtDeclarativeu.def +++ b/src/s60installs/bwins/QtDeclarativeu.def @@ -813,7 +813,7 @@ EXPORTS ??0QDeclarativeView@@QAE@ABVQUrl@@PAVQWidget@@@Z @ 812 NONAME ; QDeclarativeView::QDeclarativeView(class QUrl const &, class QWidget *) ?qt_metacall@QDeclarativePixmapReply@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 813 NONAME ABSENT ; int QDeclarativePixmapReply::qt_metacall(enum QMetaObject::Call, int, void * *) ?valueChanged@QDeclarativeExpression@@IAEXXZ @ 814 NONAME ; void QDeclarativeExpression::valueChanged(void) - ?childrenChanged@QDeclarativeItem@@IAEXXZ @ 815 NONAME ; void QDeclarativeItem::childrenChanged(void) + ?childrenChanged@QDeclarativeItem@@IAEXXZ @ 815 NONAME ABSENT ; void QDeclarativeItem::childrenChanged(void) ??_EQDeclarativeView@@UAE@I@Z @ 816 NONAME ; QDeclarativeView::~QDeclarativeView(unsigned int) ?trUtf8@QDeclarativeStateGroup@@SA?AVQString@@PBD0H@Z @ 817 NONAME ; class QString QDeclarativeStateGroup::trUtf8(char const *, char const *, int) ?tag@QMetaMethodBuilder@@QBE?AVQByteArray@@XZ @ 818 NONAME ; class QByteArray QMetaMethodBuilder::tag(void) const diff --git a/src/s60installs/eabi/QtDeclarativeu.def b/src/s60installs/eabi/QtDeclarativeu.def index dd5103f..bcb91fa 100644 --- a/src/s60installs/eabi/QtDeclarativeu.def +++ b/src/s60installs/eabi/QtDeclarativeu.def @@ -59,7 +59,7 @@ EXPORTS _ZN16QDeclarativeItem13parentChangedEPS_ @ 58 NONAME _ZN16QDeclarativeItem13setParentItemEPS_ @ 59 NONAME _ZN16QDeclarativeItem13smoothChangedEb @ 60 NONAME - _ZN16QDeclarativeItem15childrenChangedEv @ 61 NONAME + _ZN16QDeclarativeItem15childrenChangedEv @ 61 NONAME ABSENT _ZN16QDeclarativeItem15geometryChangedERK6QRectFS2_ @ 62 NONAME _ZN16QDeclarativeItem15keyReleaseEventEP9QKeyEvent @ 63 NONAME _ZN16QDeclarativeItem16inputMethodEventEP17QInputMethodEvent @ 64 NONAME |