diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-05 08:18:46 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-12-05 08:18:46 +0000 |
| commit | bb0ed6b2a9b763927022d41faf80ebcf745c0d01 (patch) | |
| tree | 5bb22627915fee21fd1607937039cddad8c7f2d4 /src | |
| parent | 80ba7e03afe18cc44715f7cf9a038bedff01f328 (diff) | |
| parent | b573cc011b146461a8434fe817177ba979fb3a5f (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12.0' into 5.12" into refs/staging/5.12
Diffstat (limited to 'src')
| -rw-r--r-- | src/controls/Private/qquickcontrolsettings.cpp | 2 | ||||
| -rw-r--r-- | src/controls/doc/qtquickcontrols1.qdocconf | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/controls/Private/qquickcontrolsettings.cpp b/src/controls/Private/qquickcontrolsettings.cpp index 95c656b29..d06f931af 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 29a01ae2b..d2ea0c475 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 |