diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-11 14:03:47 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-11 14:03:47 +0200 |
| commit | c32c776bf4bd0bc601cb78f9814036cb40b33b52 (patch) | |
| tree | a390a1b5909c0396271be5f29b818ba114328e70 /src/quicktemplates2/qquicklabel.cpp | |
| parent | 4997773a6ed0ea9908cd67ab0335d2ae177a6320 (diff) | |
| parent | d3aef722da533c3b100ba653498c79986a44c9f9 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/quicktemplates2/qquicklabel.cpp
src/quicktemplates2/qquicktextarea.cpp
src/quicktemplates2/qquicktextfield.cpp
Change-Id: Ibbf6bc48972f58fbc6779a87ac9e2434c56c4db8
Diffstat (limited to 'src/quicktemplates2/qquicklabel.cpp')
| -rw-r--r-- | src/quicktemplates2/qquicklabel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquicklabel.cpp b/src/quicktemplates2/qquicklabel.cpp index f1a5d15e..724fd086 100644 --- a/src/quicktemplates2/qquicklabel.cpp +++ b/src/quicktemplates2/qquicklabel.cpp @@ -315,8 +315,9 @@ void QQuickLabel::itemChange(QQuickItem::ItemChange change, const QQuickItem::It case ItemEnabledHasChanged: emit paletteChanged(); break; + case ItemSceneChange: case ItemParentHasChanged: - if (value.item) { + if ((change == ItemParentHasChanged && value.item) || (change == ItemSceneChange && value.window)) { d->resolveFont(); d->resolvePalette(); } |