diff options
| author | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-03-09 12:41:43 (GMT) |
|---|---|---|
| committer | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-03-09 12:41:43 (GMT) |
| commit | 796b084fbaaeeacbb6af7b3a2d132b5900c3db62 (patch) | |
| tree | 1d34a97cefa0ee2806cf54d0feb6efb9a48f4288 /src/gui | |
| parent | 5440d903532a37fdd69ae60e6579f82909996620 (diff) | |
| parent | dc6b5702e0c488bf51ca029290eb65604bfb1dd5 (diff) | |
| download | Qt-796b084fbaaeeacbb6af7b3a2d132b5900c3db62.zip Qt-796b084fbaaeeacbb6af7b3a2d132b5900c3db62.tar.gz Qt-796b084fbaaeeacbb6af7b3a2d132b5900c3db62.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/image/qpixmap.cpp | 2 | ||||
| -rw-r--r-- | src/gui/text/qtextcontrol.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index 0aefafb..1a83318 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -1997,7 +1997,7 @@ void QPixmap::detach() } if (data->is_cached && data->ref == 1) - QImagePixmapCleanupHooks::executePixmapDataModificationHooks(pd); + QImagePixmapCleanupHooks::executePixmapDataModificationHooks(data.data()); #if defined(Q_WS_MAC) QMacPixmapData *macData = id == QPixmapData::MacClass ? static_cast<QMacPixmapData*>(pd) : 0; diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp index f4054d3..f5da079 100644 --- a/src/gui/text/qtextcontrol.cpp +++ b/src/gui/text/qtextcontrol.cpp @@ -284,7 +284,7 @@ bool QTextControlPrivate::cursorMoveKeyEvent(QKeyEvent *e) if (cursor.position() != oldCursorPos) emit q->cursorPositionChanged(); emit q->microFocusChanged(); - } else if (ignoreNavigationEvents && isNavigationEvent) { + } else if (ignoreNavigationEvents && isNavigationEvent && oldSelection.anchor() == cursor.anchor()) { return false; } |