diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-09 01:00:17 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-05-09 09:31:24 +0200 |
| commit | 90f85482bb0499a55993b94743266fedf4cefef1 (patch) | |
| tree | a97a45390ace4b284d80a506e76d2e58bb24d29c /src/quick/accessible/qaccessiblequickitem_p.h | |
| parent | ae8c798a0a01334d1af33a59acdaeda8898a9f5c (diff) | |
| parent | 0a775ded35acf7172e3f852d55de7e28a5370653 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/qml/compiler/qqmlirbuilder.cpp
Change-Id: I2cfda470515e2df778ad3c89105c07344af07c6d
Diffstat (limited to 'src/quick/accessible/qaccessiblequickitem_p.h')
| -rw-r--r-- | src/quick/accessible/qaccessiblequickitem_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick/accessible/qaccessiblequickitem_p.h b/src/quick/accessible/qaccessiblequickitem_p.h index 5375d37bf0..931e995f0f 100644 --- a/src/quick/accessible/qaccessiblequickitem_p.h +++ b/src/quick/accessible/qaccessiblequickitem_p.h @@ -83,6 +83,7 @@ public: QAccessible::State state() const override; QAccessible::Role role() const override; QString text(QAccessible::Text) const override; + void setText(QAccessible::Text, const QString &text) override; bool isAccessible() const; |