1 files changed, 9 insertions, 4 deletions
diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
index c84e6628a5..9f8788123b 100644
--- a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
+++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
@@ -73,7 +73,7 @@ static inline int qsg_device_pixel_ratio(QOpenGLContext *ctx)
         else
             devicePixelRatio = w->devicePixelRatio();
     } else {
-        devicePixelRatio = ctx->screen()->devicePixelRatio();
+        devicePixelRatio = ctx->screen() ? ctx->screen()->devicePixelRatio() : qGuiApp->devicePixelRatio();
     }
     return devicePixelRatio;
 }
@@ -104,8 +104,11 @@ char const *const *QSGTextMaskShader::attributeNames() const
 }
 
 QSGTextMaskShader::QSGTextMaskShader(QFontEngine::GlyphFormat glyphFormat)
-    : QSGMaterialShader(*new QSGMaterialShaderPrivate),
-      m_glyphFormat(glyphFormat)
+    : QSGMaterialShader(*new QSGMaterialShaderPrivate)
+    , m_matrix_id(-1)
+    , m_color_id(-1)
+    , m_textureScale_id(-1)
+    , m_glyphFormat(glyphFormat)
 {
     setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/scenegraph/shaders/textmask.vert"));
     setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/scenegraph/shaders/textmask.frag"));
@@ -435,7 +438,9 @@ void QSGTextMaskMaterial::populate(const QPointF &p,
 {
     Q_ASSERT(m_font.isValid());
     QVector<QFixedPoint> fixedPointPositions;
-    for (int i=0; i<glyphPositions.size(); ++i)
+    const int glyphPositionsSize = glyphPositions.size();
+    fixedPointPositions.reserve(glyphPositionsSize);
+    for (int i=0; i < glyphPositionsSize; ++i)
         fixedPointPositions.append(QFixedPoint::fromPointF(glyphPositions.at(i)));
 
     QTextureGlyphCache *cache = glyphCache();