diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-15 15:38:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-15 15:38:48 (GMT) |
| commit | ab90235dfa1874e5c70875ed9b68817e698a55b3 (patch) | |
| tree | 819e6302328b79ddef9cf97246949f57d885dd30 /src/gui/text | |
| parent | 04d0a534c6fe64d308652da2ada109c7d6bd72ed (diff) | |
| parent | e5fe06c4b76eea0f1755419bfb6b89325824a852 (diff) | |
| download | Qt-ab90235dfa1874e5c70875ed9b68817e698a55b3.zip Qt-ab90235dfa1874e5c70875ed9b68817e698a55b3.tar.gz Qt-ab90235dfa1874e5c70875ed9b68817e698a55b3.tar.bz2 | |
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Revert accidental commit
Rework threading internals in XmlListModel to avoid global static
Fix undesirable VKB popup at task switch
Fix compile errors on S60 3.2
Fix to QGLWidget rendering with VG graphics system
Symbian/gcce: Remove the useless -T flag
Fix installation on S60 5.0
Fix fancybrowser.pro
Move cursorDelegate with the mouse selection of read only text input.
Ignore child elements in non-application caption/pkg name translations
Updating libpng: Patches to libpng 1.5.4 for building it in Qt
Updating libpng: Add libpng version 1.5.4
Updating libpng: Remove version 1.4.0
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qfontdatabase_s60.cpp | 2 | ||||
| -rw-r--r-- | src/gui/text/qtextcontrol.cpp | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/gui/text/qfontdatabase_s60.cpp b/src/gui/text/qfontdatabase_s60.cpp index cf96733..ffa4e59 100644 --- a/src/gui/text/qfontdatabase_s60.cpp +++ b/src/gui/text/qfontdatabase_s60.cpp @@ -58,7 +58,7 @@ #endif // SYMBIAN_ENABLE_SPLIT_HEADERS #endif // QT_NO_FREETYPE -#ifndef SYMBIAN_VERSION_9_4 +#if !defined(SYMBIAN_VERSION_9_4) && !defined(SYMBIAN_VERSION_9_3) && !defined(SYMBIAN_VERSION_9_2) #define SYMBIAN_LINKEDFONTS_SUPPORTED #endif // !SYMBIAN_VERSION_9_4 diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp index aacac04..e32e112 100644 --- a/src/gui/text/qtextcontrol.cpp +++ b/src/gui/text/qtextcontrol.cpp @@ -1665,8 +1665,10 @@ void QTextControlPrivate::mouseMoveEvent(QEvent *e, Qt::MouseButton button, cons #endif //QT_NO_IM } else { //emit q->visibilityRequest(QRectF(mousePos, QSizeF(1, 1))); - if (cursor.position() != oldCursorPos) + if (cursor.position() != oldCursorPos) { emit q->cursorPositionChanged(); + emit q->microFocusChanged(); + } } selectionChanged(true); repaintOldAndNewSelection(oldSelection); @@ -1710,8 +1712,10 @@ void QTextControlPrivate::mouseReleaseEvent(QEvent *e, Qt::MouseButton button, c repaintOldAndNewSelection(oldSelection); - if (cursor.position() != oldCursorPos) + if (cursor.position() != oldCursorPos) { emit q->cursorPositionChanged(); + emit q->microFocusChanged(); + } if (interactionFlags & Qt::LinksAccessibleByMouse) { if (!(button & Qt::LeftButton)) |