diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-26 08:51:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-26 08:51:55 (GMT) |
| commit | 2d071521228a6bc9ef423cbdbbd8560d28208790 (patch) | |
| tree | bbc4f21d6d4a0c55458066aa0875520a39c60361 /src/declarative/graphicsitems/qdeclarativeanchors.cpp | |
| parent | 24bc9a2f23bb07cf5e506d493d9ff1eb89398a7c (diff) | |
| parent | cb8d8035dcf949e4b372e83d1c6e701a4ac3527a (diff) | |
| download | Qt-2d071521228a6bc9ef423cbdbbd8560d28208790.zip Qt-2d071521228a6bc9ef423cbdbbd8560d28208790.tar.gz Qt-2d071521228a6bc9ef423cbdbbd8560d28208790.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Run util/normalize on src/declarative.
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())); } } |