Merge "Merge remote-tracking branch 'origin/5.12.0' into 5.12" into refs/staging/5.12

3 files changed, 29 insertions, 2 deletions

diff --git a/dist/changes-5.12.0 b/dist/changes-5.12.0
new file mode 100644
index 00000000..0453ff44
--- /dev/null
+++ b/dist/changes-5.12.0
@@ -0,0 +1,25 @@
+Qt 5.12 introduces many new features and improvements as well as bugfixes
+over the 5.11.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                                 Dialogs                                  *
+****************************************************************************
+
+ - [QTBUG-69095] Add a signal to the Dialog class to allow the client to
+   intercept the button presses and optionally prevent further processing
+   of the event. This allows performing some validation on the fields
+   before dismissing the dialog.
diff --git a/src/controls/Private/qquickcontrolsettings.cpp b/src/controls/Private/qquickcontrolsettings.cpp
index 95c656b2..d06f931a 100644
--- a/src/controls/Private/qquickcontrolsettings.cpp
+++ b/src/controls/Private/qquickcontrolsettings.cpp
@@ -161,7 +161,7 @@ QQmlComponent *QQuickControlSettings1::styleComponent(const QUrl &styleDirUrl, c
         styleFileUrl = makeStyleComponentUrl(controlStyleName, m_styleMap.value(QStringLiteral("Base")).m_styleDirPath);
     }
 
-    return new QQmlComponent(qmlEngine(control), styleFileUrl);
+    return new QQmlComponent(qmlEngine(control), styleFileUrl, this);
 }
 
 static QString relativeStyleImportPath(QQmlEngine *engine, const QString &styleName)
diff --git a/src/controls/doc/qtquickcontrols1.qdocconf b/src/controls/doc/qtquickcontrols1.qdocconf
index 29a01ae2..d2ea0c47 100644
--- a/src/controls/doc/qtquickcontrols1.qdocconf
+++ b/src/controls/doc/qtquickcontrols1.qdocconf
@@ -69,7 +69,9 @@ excludefiles += ../TableView.qml \
 
 excludedirs += ../Styles/Desktop \
                ../Styles/Android \
-               ../Styles/iOS
+               ../Styles/iOS \
+               ../Styles/WinRT
+
 
 imagedirs += images \
     ../../extras/doc/images