Disable native glyph rendering on embedded

Change-Id: I71769affe8f0138dd65f3b94fb27176bd069ab8d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
index e83a2cb..5fe0b52 100644 (file)
--- 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 2facb98..f4934e2 100644 (file)
--- 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 30be926..9a31189 100644 (file)
--- 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 8d36fce..5d894e5 100644 (file)
--- 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
 }
 
 /*!