diff options
| author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-04-25 15:17:40 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-25 15:41:41 +0200 |
| commit | 4d54326fece7fe915902e3bbac34aa0e2569f219 (patch) | |
| tree | 0a8a92659d3da74b3edac42541b5da34558c0bd1 /src/quick | |
| parent | d3852ae731ff3a32b3063b049101a7ee7f92ae8b (diff) | |
Disable native glyph rendering on embedded
Change-Id: I71769affe8f0138dd65f3b94fb27176bd069ab8d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/items/qquicktext.cpp | 3 | ||||
| -rw-r--r-- | src/quick/items/qquicktextedit.cpp | 3 | ||||
| -rw-r--r-- | src/quick/items/qquicktextinput.cpp | 3 | ||||
| -rw-r--r-- | src/quick/scenegraph/qsgcontext.cpp | 4 |
4 files changed, 10 insertions, 3 deletions
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index e83a2cb08b..5fe0b528fa 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -313,7 +313,8 @@ qreal QQuickTextPrivate::getImplicitHeight() const combination with the NativeRendering render type will lend poor and sometimes pixelated results. - On HighDpi "retina" displays this property is ignored and QtRendering is always used. + On HighDpi "retina" displays and mobile and embedded platforms, this property is ignored + and QtRendering is always used. */ QQuickText::RenderType QQuickText::renderType() const { diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp index 2facb9846d..f4934e2400 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -380,7 +380,8 @@ void QQuickTextEdit::setTextFormat(TextFormat format) combination with the NativeRendering render type will lend poor and sometimes pixelated results. - On HighDpi "retina" displays this property is ignored and QtRendering is always used. + On HighDpi "retina" displays and mobile and embedded platforms, this property is ignored + and QtRendering is always used. */ QQuickTextEdit::RenderType QQuickTextEdit::renderType() const { diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index 30be92672d..9a311895f6 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -154,7 +154,8 @@ void QQuickTextInput::setText(const QString &s) combination with the NativeRendering render type will lend poor and sometimes pixelated results. - On HighDpi "retina" displays this property is ignored and QtRendering is always used. + On HighDpi "retina" displays and mobile and embedded platforms, this property is ignored + and QtRendering is always used. */ QQuickTextInput::RenderType QQuickTextInput::renderType() const { diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp index 8d36fce481..5d894e5236 100644 --- a/src/quick/scenegraph/qsgcontext.cpp +++ b/src/quick/scenegraph/qsgcontext.cpp @@ -354,7 +354,11 @@ QSGDistanceFieldGlyphCache *QSGContext::distanceFieldGlyphCache(const QRawFont & */ QSGGlyphNode *QSGContext::createNativeGlyphNode() { +#if defined(QT_OPENGL_ES) && !defined(QT_OPENGL_ES_2_ANGLE) + return createGlyphNode(); +#else return new QSGDefaultGlyphNode; +#endif } /*! |