diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-10-22 14:16:51 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-10-22 13:19:47 +0000 |
| commit | 51458ba5400c1dcaef1bd2101cbf60a8ddc2a0fa (patch) | |
| tree | 6b752b010641a3474f85871abd11700b63e71a5d /src/imports/controls | |
| parent | f765bca3f7d34db01d1fc453d4ebce66c278fe2a (diff) | |
Flat style: fix inheritance for re-parented items
Change-Id: I33e77f93477b20a4f7af4f10fa8dde95fad1863a
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/controls')
| -rw-r--r-- | src/imports/controls/qquicktheme.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/qquicktheme.cpp b/src/imports/controls/qquicktheme.cpp index f0345df2..923d452b 100644 --- a/src/imports/controls/qquicktheme.cpp +++ b/src/imports/controls/qquicktheme.cpp @@ -344,11 +344,11 @@ const QQuickThemeData &QQuickThemeAttachedPrivate::resolve() const return theme ? theme->d_func()->data : *globalThemeData(); } -void QQuickThemeAttachedPrivate::itemParentChanged(QQuickItem *item, QQuickItem *) +void QQuickThemeAttachedPrivate::itemParentChanged(QQuickItem *item, QQuickItem *parentItem) { QQuickThemeAttached *theme = QQuickStyle::instance<QQuickThemeAttached>(item); if (theme) { - QQuickThemeAttached *parent = QQuickStyle::findParent<QQuickThemeAttached>(theme); + QQuickThemeAttached *parent = QQuickStyle::findParent<QQuickThemeAttached>(parentItem); if (parent) theme->setParentTheme(parent); } |