Merge pull request #67 from sletta/allow-native-glyphs

[mer] Allow creation of 'native' glyph nodes.
sailfishos · Apr 9, 2015 · cc68190 · cc68190
2 parents 3ccb8fb + c249415
commit cc68190
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp
@@ -429,16 +429,8 @@ QSGImageNode *QSGContext::createImageNode()
 */
 QSGGlyphNode *QSGContext::createNativeGlyphNode(QSGRenderContext *rc)
 {
-#if defined(QT_OPENGL_ES) && !defined(QT_OPENGL_ES_2_ANGLE)
-    Q_D(QSGContext);
-    if (d->distanceFieldDisabled)
-        return new QSGDefaultGlyphNode;
-    else
-        return createGlyphNode(rc);
-#else
     Q_UNUSED(rc);
     return new QSGDefaultGlyphNode;
-#endif
 }
 
 /*!