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/qquickcontrol_p_p.h | |
| 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/qquickcontrol_p_p.h')
| -rw-r--r-- | src/templates/qquickcontrol_p_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/templates/qquickcontrol_p_p.h b/src/templates/qquickcontrol_p_p.h index 21f6c1b1..d7821ec7 100644 --- a/src/templates/qquickcontrol_p_p.h +++ b/src/templates/qquickcontrol_p_p.h @@ -104,8 +104,7 @@ public: static QFont themeFont(QPlatformTheme::Font type); void updateLocale(const QLocale &l, bool e); static void updateLocaleRecur(QQuickItem *item, const QLocale &l); - - QLocale calcLocale() const; + static QLocale calcLocale(QQuickItem *); QFont font; bool hasTopPadding; |