diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-17 05:00:54 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-17 05:00:54 (GMT) |
| commit | efc8b0c9c97a84097bc7f62a109e455caa8b2279 (patch) | |
| tree | c2db4a844ba39a96125d4eba2f56b1c51a46badb /src/gui | |
| parent | dc5543f5595870209e8122d13d070694b5e0eb39 (diff) | |
| parent | a6b0458c5ab5bc8ad6c868425820e0bf0e932336 (diff) | |
| download | Qt-efc8b0c9c97a84097bc7f62a109e455caa8b2279.zip Qt-efc8b0c9c97a84097bc7f62a109e455caa8b2279.tar.gz Qt-efc8b0c9c97a84097bc7f62a109e455caa8b2279.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
doc: add note that items with width or height of 0 are not positioned.
Add test for model data changes.
clearFocus() shouldn't mess with focus if it doesn't have focus
Fix the N900 device orientation backend
Micro cleanup
Write TextInput.positionToRectangle docs.
Minor demo fixes
Fix autoScroll implementation
Move knowledge of QGraphicsObject out of qml engine
Stopping a flick resulted in the next click being consumed.
Enhance docs
Slight addition to the docs.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 8042c46..c9176d1 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -3277,7 +3277,8 @@ void QGraphicsItemPrivate::setFocusHelper(Qt::FocusReason focusReason, bool clim */ void QGraphicsItem::clearFocus() { - d_ptr->clearFocusHelper(/* giveFocusToParent = */ true); + if (hasFocus()) + d_ptr->clearFocusHelper(/* giveFocusToParent = */ true); } /*! |