aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquicktextarea_p.h
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-11-04 10:49:42 +0100
committerJ-P Nurmi <jpnurmi@qt.io>2017-11-06 10:17:22 +0000
commit430fe83ecb7106118cbebd735637aee9e9253914 (patch)
treec27f1c2a5ae6a2b740467375439d8eac021e06e0 /src/quicktemplates2/qquicktextarea_p.h
parent6470a54ed34523822c50ac846a17a9f76564cf58 (diff)
Re-order all revisioned members and add explanatory comments
We've come to realize that even though it's tempting to group similar properties together, organizing the API so that revisions are grouped together makes future maintenance more pleasant. It's a lot easier to to see what was added and when. Change-Id: I47ba7725260f2c259048848cc2a9b17bce2f01c7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquicktextarea_p.h')
-rw-r--r--src/quicktemplates2/qquicktextarea_p.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/quicktemplates2/qquicktextarea_p.h b/src/quicktemplates2/qquicktextarea_p.h
index 87cb57bc..507f8b14 100644
--- a/src/quicktemplates2/qquicktextarea_p.h
+++ b/src/quicktemplates2/qquicktextarea_p.h
@@ -67,6 +67,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTextArea : public QQuickTextEdit
Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL)
Q_PROPERTY(QString placeholderText READ placeholderText WRITE setPlaceholderText NOTIFY placeholderTextChanged FINAL)
Q_PROPERTY(Qt::FocusReason focusReason READ focusReason WRITE setFocusReason NOTIFY focusReasonChanged FINAL)
+ // 2.1 (Qt 5.8)
Q_PROPERTY(bool hovered READ isHovered NOTIFY hoveredChanged FINAL REVISION 1)
Q_PROPERTY(bool hoverEnabled READ isHoverEnabled WRITE setHoverEnabled RESET resetHoverEnabled NOTIFY hoverEnabledChanged FINAL REVISION 1)
@@ -88,6 +89,9 @@ public:
Qt::FocusReason focusReason() const;
void setFocusReason(Qt::FocusReason reason);
+ bool contains(const QPointF &point) const override;
+
+ // 2.1 (Qt 5.8)
bool isHovered() const;
void setHovered(bool hovered);
@@ -95,8 +99,6 @@ public:
void setHoverEnabled(bool enabled);
void resetHoverEnabled();
- bool contains(const QPointF &point) const override;
-
Q_SIGNALS:
void fontChanged();
void implicitWidthChanged3();
@@ -104,11 +106,12 @@ Q_SIGNALS:
void backgroundChanged();
void placeholderTextChanged();
void focusReasonChanged();
- Q_REVISION(1) void hoveredChanged();
- Q_REVISION(1) void hoverEnabledChanged();
void pressAndHold(QQuickMouseEvent *event);
+ // 2.1 (Qt 5.8)
Q_REVISION(1) void pressed(QQuickMouseEvent *event);
Q_REVISION(1) void released(QQuickMouseEvent *event);
+ Q_REVISION(1) void hoveredChanged();
+ Q_REVISION(1) void hoverEnabledChanged();
protected:
void classBegin() override;