Merge branch '4.5' of [email protected]:qt/qt into 4.5

Author: Jason McDonald

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