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

Change-Id: If9a205bea219b9aca95d78b1e556ca9bbff58dd0

3 files changed, 7 insertions, 1 deletions

diff --git a/src/imports/dialogs/plugin.cpp b/src/imports/dialogs/plugin.cpp
index 44df1447d1..70e12093b6 100644
--- a/src/imports/dialogs/plugin.cpp
+++ b/src/imports/dialogs/plugin.cpp
@@ -180,7 +180,7 @@ protected:
         // If there is a qmldir and we have a QApplication instance (as opposed to a
         // widget-free QGuiApplication), assume that the widget-based dialog will work.
         if (hasTopLevelWindows && widgetsDir.exists("qmldir") &&
-                !qstrcmp(QCoreApplication::instance()->metaObject()->className(), "QApplication")) {
+                QCoreApplication::instance()->inherits("QApplication")) {
             QUrl dialogQmlPath =  m_useResources ?
                 QUrl(QString("qrc:/QtQuick/Dialogs/Widget%1.qml").arg(qmlName)) :
                 QUrl::fromLocalFile(qmlDir.filePath(QString("Widget%1.qml").arg(qmlName)));
diff --git a/src/imports/dialogs/qquickabstractcolordialog.cpp b/src/imports/dialogs/qquickabstractcolordialog.cpp
index abac997ca6..1931bde905 100644
--- a/src/imports/dialogs/qquickabstractcolordialog.cpp
+++ b/src/imports/dialogs/qquickabstractcolordialog.cpp
@@ -70,6 +70,11 @@ void QQuickAbstractColorDialog::setVisible(bool v)
         m_dlgHelper->setCurrentColor(m_color);
     }
     QQuickAbstractDialog::setVisible(v);
+    // QTBUG-35206
+#if defined(Q_OS_WIN)
+    if (m_dialogWindow)
+        m_dialogWindow->setWidth(m_dialogWindow->width() + 1);
+#endif
 }
 
 void QQuickAbstractColorDialog::setModality(Qt::WindowModality m)
diff --git a/src/imports/dialogs/qquickabstractfiledialog.cpp b/src/imports/dialogs/qquickabstractfiledialog.cpp
index 3a0d5baa83..0cac801311 100644
--- a/src/imports/dialogs/qquickabstractfiledialog.cpp
+++ b/src/imports/dialogs/qquickabstractfiledialog.cpp
@@ -56,6 +56,7 @@ QQuickAbstractFileDialog::QQuickAbstractFileDialog(QObject *parent)
     , m_selectMultiple(false)
     , m_selectFolder(false)
 {
+    updateModes();
     connect(this, SIGNAL(accepted()), this, SIGNAL(selectionAccepted()));
 }