Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: I8b5a10d897a926078895ae41f48cdbd2474902b8

2 files changed, 5 insertions, 3 deletions

diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index 4cf52f994a..39540cf898 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -113,8 +113,10 @@
 static void initResources()
 {
     Q_INIT_RESOURCE(qstyle);
-    Q_INIT_RESOURCE(qmessagebox);
 
+#if QT_CONFIG(messagebox)
+    Q_INIT_RESOURCE(qmessagebox);
+#endif
 }
 
 QT_BEGIN_NAMESPACE
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index 138733476f..923245c53c 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -5457,11 +5457,11 @@ void QWidgetPrivate::drawWidget(QPaintDevice *pdev, const QRegion &rgn, const QP
                 setSystemClip(pdev->paintEngine(), pdev->devicePixelRatioF(), rgn.translated(offset));
                 QPainter p(pdev);
                 p.translate(offset);
-                context.painter = context.sharedPainter = &p;
+                context.painter = &p;
                 graphicsEffect->draw(&p);
                 setSystemClip(pdev->paintEngine(), 1, QRegion());
             } else {
-                context.painter = context.sharedPainter = sharedPainter;
+                context.painter = sharedPainter;
                 if (sharedPainter->worldTransform() != sourced->lastEffectTransform) {
                     sourced->invalidateCache();
                     sourced->lastEffectTransform = sharedPainter->worldTransform();