diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-17 21:19:29 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-17 21:19:29 (GMT) |
| commit | 53d9e3620ede7492c141402d9365d5c0dd7c10fd (patch) | |
| tree | 012247296bab712fcd19b92cf1a5990fd0ed2af1 /src/gui/text/qtextengine_p.h | |
| parent | cee22b68ed811f5b26a891d6a644613ad79aa981 (diff) | |
| parent | f7a6de98e4e234833966fbe81b8ab54eba9f8429 (diff) | |
| download | Qt-53d9e3620ede7492c141402d9365d5c0dd7c10fd.zip Qt-53d9e3620ede7492c141402d9365d5c0dd7c10fd.tar.gz Qt-53d9e3620ede7492c141402d9365d5c0dd7c10fd.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
QGraphicsWidget::setLayoutDirection doesn't propagate to new children
Prevent unnecessary graphics item updates when graphics effect changes.
Use more widely supported Unicode character representation
Release font engine refcount when done using it in QTextEngine
Fix - QGraphicsTextItem in a tab of QTabWidget cannot get focus
Updated Changelog
Do not put cursor at non-stop character positions
doc: Fix incorrect enum name in QRawFont::alphaMapForGlyph docs
Diffstat (limited to 'src/gui/text/qtextengine_p.h')
| -rw-r--r-- | src/gui/text/qtextengine_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h index 067e81d..9362022 100644 --- a/src/gui/text/qtextengine_p.h +++ b/src/gui/text/qtextengine_p.h @@ -629,7 +629,6 @@ public: int lineNumberForTextPosition(int pos); int positionAfterVisualMovement(int oldPos, QTextCursor::MoveOperation op); void insertionPointsForLine(int lineNum, QVector<int> &insertionPoints); - void resetFontEngineCache(); private: |