summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-12-05 09:18:43 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-12-05 09:18:43 +0100
commitb573cc011b146461a8434fe817177ba979fb3a5f (patch)
tree51d0a3013c27d7c0060d8174a890d009332c0cc9 /src
parent50b6fb27458708a18f4114e3ebec0fa632b2659f (diff)
parent7250a5c2f9dbb61e2c8289f1bf28db2300ce43ad (diff)
downloadqtquickcontrols-b573cc011b146461a8434fe817177ba979fb3a5f.tar.gz
Merge remote-tracking branch 'origin/5.12.0' into 5.12
Change-Id: I253bdcb4f9847a73165196599341dab03e291fc1
Diffstat (limited to 'src')
-rw-r--r--src/controls/Private/qquickcontrolsettings.cpp2
-rw-r--r--src/controls/doc/qtquickcontrols1.qdocconf4
2 files changed, 4 insertions, 2 deletions
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