Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/corelib/mimetypes/qmimeprovider.cpp
	src/corelib/mimetypes/qmimetype.cpp

Change-Id: Ib483ddb6bfc380e7c8f195feca535703814c3872

1 files changed, 10 insertions, 8 deletions

diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp
index 5c046d0130..4cf77b7a1e 100644
--- a/src/widgets/styles/qstylesheetstyle.cpp
+++ b/src/widgets/styles/qstylesheetstyle.cpp
@@ -1002,15 +1002,17 @@ QRenderRule::QRenderRule(const QVector<Declaration> &declarations, const QObject
         }
     }
 
-    if (const QWidget *widget = qobject_cast<const QWidget *>(object)) {
-        QStyleSheetStyle *style = const_cast<QStyleSheetStyle *>(globalStyleSheetStyle);
-        if (!style)
-            style = qobject_cast<QStyleSheetStyle *>(widget->style());
-        if (style)
-            fixupBorder(style->nativeFrameWidth(widget));
+    if (hasBorder()) {
+        if (const QWidget *widget = qobject_cast<const QWidget *>(object)) {
+            QStyleSheetStyle *style = const_cast<QStyleSheetStyle *>(globalStyleSheetStyle);
+            if (!style)
+                style = qobject_cast<QStyleSheetStyle *>(widget->style());
+            if (style)
+                fixupBorder(style->nativeFrameWidth(widget));
+        }
+        if (border()->hasBorderImage())
+            defaultBackground = QBrush();
     }
-    if (hasBorder() && border()->hasBorderImage())
-        defaultBackground = QBrush();
 }
 
 QRect QRenderRule::borderRect(const QRect& r) const