From 89536d041b057cd68797a7afa037e7f7a932f3c4 Mon Sep 17 00:00:00 2001
From: Olivier Blin <olivier.blin@softathome.com>
Date: Wed, 18 Feb 2015 19:23:30 +0100
Subject: Fix crash in QPainter::drawGlyphRun() when painter is not active

Change-Id: I24f52cf1db300b8a6d0a4cb19fc6c74c41e00dbc
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
---
 src/gui/painting/qpainter.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src')

diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index d40a2b9456..de37c5635c 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -5534,6 +5534,11 @@ void QPainter::drawGlyphRun(const QPointF &position, const QGlyphRun &glyphRun)
 {
     Q_D(QPainter);
 
+    if (!d->engine) {
+        qWarning("QPainter::drawGlyphRun: Painter not active");
+        return;
+    }
+
     QRawFont font = glyphRun.rawFont();
     if (!font.isValid())
         return;
-- 
cgit v1.2.3