diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-31 09:36:32 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-31 09:36:32 (GMT) |
commit | 0c439d67f567ba2e7a1b9ada4e3953e5e598f168 (patch) | |
tree | 00801dada770fe63e3027df58d116edccfe07cfd /src/gui/graphicsview/qgraphicswidget.cpp | |
parent | edd41ee5488716cf8336a7d8ea0cb3d48d0e7b14 (diff) | |
parent | 622a27c582f859274a5b9e40c625a6fda600b7b1 (diff) | |
download | Qt-0c439d67f567ba2e7a1b9ada4e3953e5e598f168.zip Qt-0c439d67f567ba2e7a1b9ada4e3953e5e598f168.tar.gz Qt-0c439d67f567ba2e7a1b9ada4e3953e5e598f168.tar.bz2 |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
configure
doc/src/modules.qdoc
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicswidget.h
Diffstat (limited to 'src/gui/graphicsview/qgraphicswidget.cpp')
-rw-r--r-- | src/gui/graphicsview/qgraphicswidget.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp index c5ec01c..edb648b 100644 --- a/src/gui/graphicsview/qgraphicswidget.cpp +++ b/src/gui/graphicsview/qgraphicswidget.cpp @@ -324,14 +324,6 @@ void QGraphicsWidget::resize(const QSizeF &size) */ /*! - - \fn QGraphicsWidget::geometryChanged() - - This signal gets emitted whenever the geometry of the item changes - \internal -*/ - -/*! \property QGraphicsWidget::geometry \brief the geometry of the widget @@ -392,17 +384,13 @@ void QGraphicsWidget::setGeometry(const QRectF &rect) } QSizeF oldSize = size(); QGraphicsLayoutItem::setGeometry(newGeom); - emit geometryChanged(); + // Send resize event bool resized = newGeom.size() != oldSize; if (resized) { QGraphicsSceneResizeEvent re; re.setOldSize(oldSize); re.setNewSize(newGeom.size()); - if (oldSize.width() != newGeom.size().width()) - emit widthChanged(); - if (oldSize.height() != newGeom.size().height()) - emit heightChanged(); QApplication::sendEvent(this, &re); } } |