diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-12 17:46:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-12 17:46:51 (GMT) |
| commit | d366c69bbd02a25c61df2e99ed842fa14ec2d643 (patch) | |
| tree | fb635f7643878d0990b56e6b93791ecc6d5828b2 /src/gui | |
| parent | 97f7299854197c6093aaefc1ec174209d68892e7 (diff) | |
| parent | 3ee89bc0830f69d44f272eff5a0c886bff33c92e (diff) | |
| download | Qt-d366c69bbd02a25c61df2e99ed842fa14ec2d643.zip Qt-d366c69bbd02a25c61df2e99ed842fa14ec2d643.tar.gz Qt-d366c69bbd02a25c61df2e99ed842fa14ec2d643.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Properly emit geometryChanged() when the position change.
QCoreApplication::library path, ensure mutex lock ordering
Fix memory leak.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/graphicsview/qgraphicswidget.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp index c486c45..0fabd18 100644 --- a/src/gui/graphicsview/qgraphicswidget.cpp +++ b/src/gui/graphicsview/qgraphicswidget.cpp @@ -385,12 +385,12 @@ void QGraphicsWidget::setGeometry(const QRectF &rect) if (wd->inSetPos) { //set the new pos d->geom.moveTopLeft(pos()); + emit geometryChanged(); return; } } QSizeF oldSize = size(); QGraphicsLayoutItem::setGeometry(newGeom); - emit geometryChanged(); // Send resize event bool resized = newGeom.size() != oldSize; if (resized) { @@ -403,6 +403,7 @@ void QGraphicsWidget::setGeometry(const QRectF &rect) emit heightChanged(); QApplication::sendEvent(this, &re); } + emit geometryChanged(); } /*! |