diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-26 08:13:25 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-26 08:13:25 (GMT) |
| commit | cb8d8035dcf949e4b372e83d1c6e701a4ac3527a (patch) | |
| tree | bbc4f21d6d4a0c55458066aa0875520a39c60361 /src/declarative/graphicsitems/qdeclarativeanchors.cpp | |
| parent | d93db65ed8950b67c2ac743c3ba4ebecf42844ad (diff) | |
| parent | 9c61980b344ae6302bb0b57764c1840164745a71 (diff) | |
| download | Qt-cb8d8035dcf949e4b372e83d1c6e701a4ac3527a.zip Qt-cb8d8035dcf949e4b372e83d1c6e701a4ac3527a.tar.gz Qt-cb8d8035dcf949e4b372e83d1c6e701a4ac3527a.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeanchors.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeanchors.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeanchors.cpp b/src/declarative/graphicsitems/qdeclarativeanchors.cpp index 26fb97f..c96ca0e 100644 --- a/src/declarative/graphicsitems/qdeclarativeanchors.cpp +++ b/src/declarative/graphicsitems/qdeclarativeanchors.cpp @@ -272,7 +272,7 @@ void QDeclarativeAnchorsPrivate::addDepend(QGraphicsObject *item) } else if(itemPrivate->isWidget) { Q_Q(QDeclarativeAnchors); QGraphicsWidget *widget = static_cast<QGraphicsWidget *>(item); - QObject::connect(widget, SIGNAL(destroyed(QObject *)), q, SLOT(_q_widgetDestroyed(QObject *))); + QObject::connect(widget, SIGNAL(destroyed(QObject*)), q, SLOT(_q_widgetDestroyed(QObject*))); QObject::connect(widget, SIGNAL(geometryChanged()), q, SLOT(_q_widgetGeometryChanged())); } } @@ -289,7 +289,7 @@ void QDeclarativeAnchorsPrivate::remDepend(QGraphicsObject *item) } else if(itemPrivate->isWidget) { Q_Q(QDeclarativeAnchors); QGraphicsWidget *widget = static_cast<QGraphicsWidget *>(item); - QObject::disconnect(widget, SIGNAL(destroyed(QObject *)), q, SLOT(_q_widgetDestroyed(QObject *))); + QObject::disconnect(widget, SIGNAL(destroyed(QObject*)), q, SLOT(_q_widgetDestroyed(QObject*))); QObject::disconnect(widget, SIGNAL(geometryChanged()), q, SLOT(_q_widgetGeometryChanged())); } } |