diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-19 12:37:10 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-19 13:19:22 +0000 |
| commit | a9735e783761cc2f98001cb72e6aa37315b1af70 (patch) | |
| tree | f059a32aed0ac9a7524b473bcb4a9bff62faab6b /src/templates/qquickpopup.cpp | |
| parent | ced4f86ec71abe19ce6e719c37cfb1f74241ac66 (diff) | |
Controls: fix locale inheritance for popups
QQuickPopup is a QObject, not a QQuickControl. Then need to make
QQuickPopup::popupItem() inherit its locale from QQuickPopup::parentItem().
Task-number: QTBUG-50984
Change-Id: Ie5908f86a154502962d6406dd4067b46cc527de7
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/templates/qquickpopup.cpp')
| -rw-r--r-- | src/templates/qquickpopup.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/templates/qquickpopup.cpp b/src/templates/qquickpopup.cpp index 7bd5baf9..00b7ed84 100644 --- a/src/templates/qquickpopup.cpp +++ b/src/templates/qquickpopup.cpp @@ -1228,8 +1228,10 @@ void QQuickPopup::setParentItem(QQuickItem *parent) d->parentItem = parent; if (d->positioner.parentItem()) d->positioner.setParentItem(parent); - if (d->popupItem) + if (d->popupItem) { QQuickControlPrivate::updateFontRecur(d->popupItem, QQuickControlPrivate::naturalControlFont(parent)); + QQuickControlPrivate::updateLocaleRecur(d->popupItem, QQuickControlPrivate::calcLocale(parent)); + } emit parentChanged(); } } |