diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-04 14:11:21 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-04 14:11:21 +0100 |
| commit | 735b9de01d301c738acc7a0b26d5703d998941fb (patch) | |
| tree | 00ab2e8b84a1187fc4b620d4b3924b9e50641ce8 /src/templates | |
| parent | 340879d8263f9383d33ed4eb3271b00e54c13f47 (diff) | |
| parent | bce843844b8edabc4365d0ef7175b54551217631 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/templates/qquickpopup.cpp
Change-Id: Ic5cdde7a2d9daa0e616de999969a4399db23245b
Diffstat (limited to 'src/templates')
| -rw-r--r-- | src/templates/qquickpopup.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/templates/qquickpopup.cpp b/src/templates/qquickpopup.cpp index 35185cef..ff58ab83 100644 --- a/src/templates/qquickpopup.cpp +++ b/src/templates/qquickpopup.cpp @@ -1196,7 +1196,7 @@ void QQuickPopup::setParentItem(QQuickItem *parent) d->parentItem = parent; if (d->positioner.parentItem()) d->positioner.setParentItem(parent); - if (d->popupItem) { + if (parent) { QQuickControlPrivate::updateFontRecur(d->popupItem, QQuickControlPrivate::naturalControlFont(parent)); QQuickControlPrivate::updateLocaleRecur(d->popupItem, QQuickControlPrivate::calcLocale(parent)); } |