diff options
author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2011-06-01 15:33:38 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-19 10:18:04 +0200 |
commit | b9224af92c128f7cc66bef11849db046f10dc81f (patch) | |
tree | 6cbf656d70aebeaffddda5c256840f952907a0d6 /src/gui/text/qtextobject.h | |
parent | 1e0d1c5f2996da33db1e3e4c1f7c6ef3e1f29416 (diff) |
Enablers for using QGlyphRun in SceneGraph
Several required fixes and changes to fix problems that arose
when porting SceneGraph's QSGTextInput and QSGTextEdit to
use QSGTextNode, especially related to having selections
on the text.
Also fixes crashes with the threaded renderer on Mac OS X
when using the TextEdit or TextInput elements.
Task-number: QTBUG-18019, QTBUG-20017
Change-Id: I67f24465352daa1d2cb12b6d2f378feb676c9804
Reviewed-on: http://codereview.qt.nokia.com/2864
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Diffstat (limited to 'src/gui/text/qtextobject.h')
-rw-r--r-- | src/gui/text/qtextobject.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qtextobject.h b/src/gui/text/qtextobject.h index 9c5cc13539..c2b46e4d12 100644 --- a/src/gui/text/qtextobject.h +++ b/src/gui/text/qtextobject.h @@ -317,7 +317,7 @@ public: QString text() const; #if !defined(QT_NO_RAWFONT) - QList<QGlyphRun> glyphRuns() const; + QList<QGlyphRun> glyphRuns(int from = -1, int length = -1) const; #endif private: |