diff options
Diffstat (limited to 'src/templates/qquickcontrol_p.h')
| -rw-r--r-- | src/templates/qquickcontrol_p.h | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/src/templates/qquickcontrol_p.h b/src/templates/qquickcontrol_p.h index 346b45b3..8d4055e5 100644 --- a/src/templates/qquickcontrol_p.h +++ b/src/templates/qquickcontrol_p.h @@ -48,6 +48,7 @@ // We mean it. // +#include <QtCore/qlocale.h> #include <QtQuick/qquickitem.h> #include <QtLabsTemplates/private/qtlabstemplatesglobal_p.h> @@ -67,9 +68,9 @@ class Q_LABSTEMPLATES_EXPORT QQuickControl : public QQuickItem 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(qreal spacing READ spacing WRITE setSpacing RESET resetSpacing NOTIFY spacingChanged FINAL) - Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection WRITE setLayoutDirection NOTIFY layoutDirectionChanged FINAL) - Q_PROPERTY(Qt::LayoutDirection effectiveLayoutDirection READ effectiveLayoutDirection NOTIFY effectiveLayoutDirectionChanged FINAL) + Q_PROPERTY(QLocale locale READ locale WRITE setLocale RESET resetLocale NOTIFY localeChanged FINAL) Q_PROPERTY(bool mirrored READ isMirrored NOTIFY mirroredChanged FINAL) + Q_PROPERTY(Qt::FocusReason focusReason READ focusReason WRITE setFocusReason NOTIFY focusReasonChanged FINAL) Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL) Q_PROPERTY(QQuickItem *contentItem READ contentItem WRITE setContentItem NOTIFY contentItemChanged FINAL) @@ -107,12 +108,15 @@ public: void setSpacing(qreal spacing); void resetSpacing(); - Qt::LayoutDirection layoutDirection() const; - Qt::LayoutDirection effectiveLayoutDirection() const; - void setLayoutDirection(Qt::LayoutDirection direction); + QLocale locale() const; + void setLocale(const QLocale &locale); + void resetLocale(); bool isMirrored() const; + Qt::FocusReason focusReason() const; + void setFocusReason(Qt::FocusReason reason); + QQuickItem *background() const; void setBackground(QQuickItem *background); @@ -129,9 +133,9 @@ Q_SIGNALS: void rightPaddingChanged(); void bottomPaddingChanged(); void spacingChanged(); - void layoutDirectionChanged(); - void effectiveLayoutDirectionChanged(); + void localeChanged(); void mirroredChanged(); + void focusReasonChanged(); void backgroundChanged(); void contentItemChanged(); @@ -145,6 +149,9 @@ protected: void itemChange(ItemChange change, const ItemChangeData &value) Q_DECL_OVERRIDE; + void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE; + void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; @@ -153,6 +160,7 @@ protected: virtual void mirrorChange(); virtual void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding); virtual void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem); + virtual void localeChange(const QLocale &newLocale, const QLocale &oldLocale); #ifndef QT_NO_ACCESSIBILITY virtual void accessibilityActiveChanged(bool active); @@ -171,8 +179,8 @@ private: Q_DECLARE_PRIVATE(QQuickControl) }; -Q_DECLARE_TYPEINFO(QQuickControl, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickControl) + #endif // QQUICKCONTROL_P_H |