diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-15 03:03:05 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-15 03:03:05 +0100 |
| commit | d8f3fb7438bbbe0b807b124f26fe3204ce50c1ec (patch) | |
| tree | 0a08a13c7e6aeed42fa26f2825ddd317a1f2470d /src/controls/Private/qquickcontrolsettings.cpp | |
| parent | 9c3f0688a549c0e57c08d4715b277e05e35849d9 (diff) | |
| parent | 5e2dfd09b3ace43c2f3dc75c56933c7c723b50fb (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Ia98756445b50decfd50f6bdeb94a004fa90d3a05
Diffstat (limited to 'src/controls/Private/qquickcontrolsettings.cpp')
| -rw-r--r-- | src/controls/Private/qquickcontrolsettings.cpp | 2 |
1 files changed, 1 insertions, 1 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) |