diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-05-30 20:56:09 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-05-31 12:15:45 +0000 |
| commit | 089dd16fb6ea44d68201780e05cf08d0c5add580 (patch) | |
| tree | f4602acdd8f67d196f9e28cd43b3ca93bf0d92ea /src/quicktemplates2/qquicklabel_p_p.h | |
| parent | 108946db94bada1577a40946571827c2e93a3b63 (diff) | |
Accessibility: cleanup and fix the attached property handling
Previously qmlAttachedPropertiesObject() refused to create attached
properties object instances for objects that were not created in QML.
QQuickControl & friends created a "fallback" instance of the accessible
attached properties object, which made tst_accessible pass, but since
QQuickAccessibleAttached was not aware of the instance, accessibility
did not work for these controls that created the instance by hand.
In qtdeclarative commit 4be38ab, qmlAttachedPropertiesObject() has been
changed to allow creating attached properties for objects instantiated
in C++. This allows us to remove the non-functional fallback instance.
Change-Id: I8a86388dc4dee4721284d47aefc15940a75e6c8d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquicklabel_p_p.h')
| -rw-r--r-- | src/quicktemplates2/qquicklabel_p_p.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/quicktemplates2/qquicklabel_p_p.h b/src/quicktemplates2/qquicklabel_p_p.h index bc78d806..a8214d77 100644 --- a/src/quicktemplates2/qquicklabel_p_p.h +++ b/src/quicktemplates2/qquicklabel_p_p.h @@ -57,8 +57,6 @@ QT_BEGIN_NAMESPACE -class QQuickAccessibleAttached; - class QQuickLabelPrivate : public QQuickTextPrivate #if QT_CONFIG(accessibility) , public QAccessible::ActivationObserver @@ -108,7 +106,6 @@ public: QPalette resolvedPalette; QQuickItem *background; - QQuickAccessibleAttached *accessibleAttached; }; QT_END_NAMESPACE |