diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-11-06 14:02:21 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-11-06 14:02:21 +0100 |
| commit | c39b126a77e27296ef82a1634753c775cc5a93fb (patch) | |
| tree | 235d9568e21e59b7c70f8be81518c3ea184cf552 /src/quicktemplates2/qquicktextarea_p.h | |
| parent | dc2603562a36241c9beac0c9c4c08bcbfed7b6a2 (diff) | |
| parent | 430fe83ecb7106118cbebd735637aee9e9253914 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/quicktemplates2/qquickabstractbutton_p.h
src/quicktemplates2/qquickbuttongroup_p.h
src/quicktemplates2/qquickrangeslider.cpp
src/quicktemplates2/qquickrangeslider_p.h
src/quicktemplates2/qquickswipeview_p.h
src/quicktemplates2/qquicktextarea.cpp
src/quicktemplates2/qquicktextarea_p.h
src/quicktemplates2/qquicktextfield_p.h
Change-Id: I7cba8783b1dd85a4db534222e36572ee05dd01d0
Diffstat (limited to 'src/quicktemplates2/qquicktextarea_p.h')
| -rw-r--r-- | src/quicktemplates2/qquicktextarea_p.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/quicktemplates2/qquicktextarea_p.h b/src/quicktemplates2/qquicktextarea_p.h index 4709d41a33..0c3a6c6533 100644 --- a/src/quicktemplates2/qquicktextarea_p.h +++ b/src/quicktemplates2/qquicktextarea_p.h @@ -68,6 +68,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) Q_PROPERTY(QPalette palette READ palette WRITE setPalette RESET resetPalette NOTIFY paletteChanged FINAL REVISION 3) @@ -90,6 +91,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); @@ -97,8 +101,6 @@ public: void setHoverEnabled(bool enabled); void resetHoverEnabled(); - bool contains(const QPointF &point) const override; - QPalette palette() const; void setPalette(const QPalette &palette); void resetPalette(); @@ -110,11 +112,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(); Q_REVISION(3) void paletteChanged(); protected: |