aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-11-10 13:51:30 +0100
committerJ-P Nurmi <jpnurmi@qt.io>2016-11-16 16:43:13 +0000
commit396e680fd5f066177f7d1d77966a4d8e2e4df20f (patch)
tree23c0901c291ea8666014b0f46d70599f24919680 /src/quicktemplates2
parentab027c7d786966ab87500ca609fd45b0551902c9 (diff)
Add QQuickAbstractButton::textChange()
So QQuickMenuItem can sync its platform menu item. Change-Id: Iee4b63006c5586417b6484e24f1503d3c4a7fcad Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2')
-rw-r--r--src/quicktemplates2/qquickabstractbutton.cpp8
-rw-r--r--src/quicktemplates2/qquickabstractbutton_p.h1
2 files changed, 9 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp
index e7c34065..85f58fd5 100644
--- a/src/quicktemplates2/qquickabstractbutton.cpp
+++ b/src/quicktemplates2/qquickabstractbutton.cpp
@@ -252,8 +252,10 @@ void QQuickAbstractButton::setText(const QString &text)
if (d->text == text)
return;
+ QString oldText = d->text;
d->text = text;
setAccessibleName(text);
+ textChange(text, oldText);
emit textChanged();
}
@@ -617,6 +619,12 @@ void QQuickAbstractButton::autoRepeatChange()
{
}
+void QQuickAbstractButton::textChange(const QString &newText, const QString &oldText)
+{
+ Q_UNUSED(newText);
+ Q_UNUSED(oldText);
+}
+
#ifndef QT_NO_ACCESSIBILITY
void QQuickAbstractButton::accessibilityActiveChanged(bool active)
{
diff --git a/src/quicktemplates2/qquickabstractbutton_p.h b/src/quicktemplates2/qquickabstractbutton_p.h
index 779739de..3b4fff6b 100644
--- a/src/quicktemplates2/qquickabstractbutton_p.h
+++ b/src/quicktemplates2/qquickabstractbutton_p.h
@@ -128,6 +128,7 @@ protected:
virtual void checkableChange();
virtual void autoRepeatChange();
+ virtual void textChange(const QString &newText, const QString &oldText);
#ifndef QT_NO_ACCESSIBILITY
void accessibilityActiveChanged(bool active) override;