diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-09-02 16:40:32 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-09-14 18:51:51 +0000 |
| commit | 9ecf1fd9507101607996e8df50093098edab5d64 (patch) | |
| tree | 179df2c6dbb647b6cad44967148c7cd63e68ec6d /src/controls/qquicklabel_p_p.h | |
| parent | 8957158ce42ffe1823b7ae1304a48bfdca40ec86 (diff) | |
Controls: move Accessible from QML to C++
Controls 2.0 could be built with QT_NO_ACCESSIBILITY defined.
Added a few helper functions for accessible in QQuickControl.
Don't set text as Accessible.name for TextArea and TextField.
Change-Id: I40383bbcec2f8c742f709bdec0209623f80da449
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/controls/qquicklabel_p_p.h')
| -rw-r--r-- | src/controls/qquicklabel_p_p.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/controls/qquicklabel_p_p.h b/src/controls/qquicklabel_p_p.h index d57662a5..43f03382 100644 --- a/src/controls/qquicklabel_p_p.h +++ b/src/controls/qquicklabel_p_p.h @@ -52,12 +52,14 @@ QT_BEGIN_NAMESPACE +class QQuickAccessibleAttached; + class QQuickLabelPrivate : public QQuickTextPrivate { Q_DECLARE_PUBLIC(QQuickLabel) public: - QQuickLabelPrivate() : background(Q_NULLPTR) { } + QQuickLabelPrivate() : background(Q_NULLPTR), accessibleAttached(Q_NULLPTR) { } static QQuickLabelPrivate *get(QQuickLabel *item) { return static_cast<QQuickLabelPrivate *>(QObjectPrivate::get(item)); } @@ -72,7 +74,10 @@ public: } void resolveFont(); + void _q_textChanged(const QString &text); + QQuickItem *background; + QQuickAccessibleAttached *accessibleAttached; }; Q_DECLARE_TYPEINFO(QQuickLabelPrivate, Q_COMPLEX_TYPE); |