aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquickcontrol_p.h
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-04-26 12:42:10 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2016-04-26 13:31:18 +0000
commit345fb099aa08c72d380fed3330cc8b9d088a3cb4 (patch)
tree4cf28ead358bc333a27e6b794ca439ad27938289 /src/quicktemplates2/qquickcontrol_p.h
parent67f3da65d7d11af025a9bdd54d08ca0bf764c3ce (diff)
Control: rename activeKeyFocus to visualFocus
This is a bit more flexible, because the name is not strictly coupled with key focus. We can even add a (re)setter later if we want. This change only renames the property. Change-Id: I6707e44040f584480a8712df1af0915ae2829d57 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/quicktemplates2/qquickcontrol_p.h')
-rw-r--r--src/quicktemplates2/qquickcontrol_p.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quicktemplates2/qquickcontrol_p.h b/src/quicktemplates2/qquickcontrol_p.h
index 1657fd63..ffff75b4 100644
--- a/src/quicktemplates2/qquickcontrol_p.h
+++ b/src/quicktemplates2/qquickcontrol_p.h
@@ -72,7 +72,7 @@ class Q_QUICKTEMPLATES2_EXPORT QQuickControl : public QQuickItem
Q_PROPERTY(bool mirrored READ isMirrored NOTIFY mirroredChanged FINAL)
Q_PROPERTY(Qt::FocusPolicy focusPolicy READ focusPolicy WRITE setFocusPolicy NOTIFY focusPolicyChanged FINAL)
Q_PROPERTY(Qt::FocusReason focusReason READ focusReason WRITE setFocusReason NOTIFY focusReasonChanged FINAL)
- Q_PROPERTY(bool activeKeyFocus READ hasActiveKeyFocus NOTIFY activeKeyFocusChanged FINAL)
+ Q_PROPERTY(bool visualFocus READ hasVisualFocus NOTIFY visualFocusChanged FINAL)
Q_PROPERTY(bool hovered READ isHovered NOTIFY hoveredChanged FINAL)
Q_PROPERTY(bool hoverEnabled READ isHoverEnabled WRITE setHoverEnabled NOTIFY hoverEnabledChanged FINAL)
Q_PROPERTY(bool wheelEnabled READ isWheelEnabled WRITE setWheelEnabled NOTIFY wheelEnabledChanged FINAL)
@@ -125,7 +125,7 @@ public:
Qt::FocusReason focusReason() const;
void setFocusReason(Qt::FocusReason reason);
- bool hasActiveKeyFocus() const;
+ bool hasVisualFocus() const;
bool isHovered() const;
void setHovered(bool hovered);
@@ -156,7 +156,7 @@ Q_SIGNALS:
void mirroredChanged();
void focusPolicyChanged();
void focusReasonChanged();
- void activeKeyFocusChanged();
+ void visualFocusChanged();
void hoveredChanged();
void hoverEnabledChanged();
void wheelEnabledChanged();