diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-17 12:12:36 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-18 16:09:57 +0000 |
| commit | e1963859d6ade7a3341a48229f1bb64ef3c9ea68 (patch) | |
| tree | fec6d8f0408faad8d8e9b7c021737d266de286ab /src/templates/qquickpopup_p.h | |
| parent | 76dc0b49120b5352526595951ed1275f9001c8f2 (diff) | |
Add Popup::locale
Change-Id: I1f07318f3e018debd74e41bc0a1443c45def7bf3
Task-number: QTBUG-50984
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/templates/qquickpopup_p.h')
| -rw-r--r-- | src/templates/qquickpopup_p.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/templates/qquickpopup_p.h b/src/templates/qquickpopup_p.h index b5703746..33f44210 100644 --- a/src/templates/qquickpopup_p.h +++ b/src/templates/qquickpopup_p.h @@ -51,6 +51,7 @@ #include <QtCore/qobject.h> #include <QtCore/qmargins.h> #include <QtGui/qevent.h> +#include <QtCore/qlocale.h> #include <QtGui/qfont.h> #include <QtQuickTemplates/private/qtquicktemplatesglobal_p.h> #include <QtQml/qqml.h> @@ -93,6 +94,7 @@ class Q_QUICKTEMPLATES_EXPORT QQuickPopup : public QObject, public QQmlParserSta Q_PROPERTY(qreal leftPadding READ leftPadding WRITE setLeftPadding RESET resetLeftPadding NOTIFY leftPaddingChanged FINAL) Q_PROPERTY(qreal rightPadding READ rightPadding WRITE setRightPadding RESET resetRightPadding NOTIFY rightPaddingChanged FINAL) Q_PROPERTY(qreal bottomPadding READ bottomPadding WRITE setBottomPadding RESET resetBottomPadding NOTIFY bottomPaddingChanged FINAL) + Q_PROPERTY(QLocale locale READ locale WRITE setLocale RESET resetLocale NOTIFY localeChanged FINAL) Q_PROPERTY(QFont font READ font WRITE setFont RESET resetFont NOTIFY fontChanged FINAL) Q_PROPERTY(QQuickItem *parent READ parentItem WRITE setParentItem NOTIFY parentChanged FINAL) Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL) @@ -191,6 +193,10 @@ public: void setBottomPadding(qreal padding); void resetBottomPadding(); + QLocale locale() const; + void setLocale(const QLocale &locale); + void resetLocale(); + QFont font() const; void setFont(const QFont &font); void resetFont(); @@ -291,6 +297,7 @@ Q_SIGNALS: void rightPaddingChanged(); void bottomPaddingChanged(); void fontChanged(); + void localeChanged(); void parentChanged(); void backgroundChanged(); void contentItemChanged(); @@ -333,6 +340,7 @@ protected: virtual void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem); virtual void fontChange(const QFont &newFont, const QFont &oldFont); virtual void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry); + virtual void localeChange(const QLocale &newLocale, const QLocale &oldLocale); virtual void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data); virtual void marginsChange(const QMarginsF &newMargins, const QMarginsF &oldMargins); virtual void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding); |