From ee0690cdf553b6cf22432488ea113209203fe1ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Trond=20Kjern=C3=A5sen?= <trond@trolltech.com>
Date: Thu, 26 Nov 2009 15:47:49 +0100
Subject: Fixed a crash in the GL engine when trying to draw invalid pixmaps.

Task-number: QTBUG-6226
Reviewed-by: Eskil
---
 src/gui/painting/qpainter.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 97f3dd428f..d048d51956 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -5182,7 +5182,7 @@ void QPainter::drawPixmap(const QPointF &p, const QPixmap &pm)
 
     Q_D(QPainter);
 
-    if (!d->engine)
+    if (!d->engine || pm.isNull())
         return;
 
 #ifndef QT_NO_DEBUG
-- 
cgit v1.2.3