diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-09 15:51:04 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-05 15:27:50 +0100 |
| commit | 42477ced635c3c20c41a6b37fc499b65950e75c3 (patch) | |
| tree | 15734da233e0c0502809e885c76365da359b4c5b /src/plugins/accessible | |
| parent | 5bfe13b64f46d7b737769154ca1c3fd85e627c05 (diff) | |
Accessibility: Adapt memory management for Qt 5.1
The model was changed to cache interfaces, so
do not try to delete them.
Change-Id: I5a97a6aca38036803c62d90988bb6d02196f0b84
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Diffstat (limited to 'src/plugins/accessible')
| -rw-r--r-- | src/plugins/accessible/quick/qaccessiblequickview.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/accessible/shared/qqmlaccessible.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/accessible/quick/qaccessiblequickview.cpp b/src/plugins/accessible/quick/qaccessiblequickview.cpp index caf4b5df53..4251a80b33 100644 --- a/src/plugins/accessible/quick/qaccessiblequickview.cpp +++ b/src/plugins/accessible/quick/qaccessiblequickview.cpp @@ -133,7 +133,7 @@ static QQuickItem *childAt_helper(QQuickItem *item, int x, int y) return 0; } - QScopedPointer<QAccessibleInterface> accessibleInterface(QAccessible::queryAccessibleInterface(item)); + QAccessibleInterface *accessibleInterface = QAccessible::queryAccessibleInterface(item); // this item has no Accessible attached property if (!accessibleInterface) return 0; diff --git a/src/plugins/accessible/shared/qqmlaccessible.cpp b/src/plugins/accessible/shared/qqmlaccessible.cpp index a3f6a733c8..4abf80a60c 100644 --- a/src/plugins/accessible/shared/qqmlaccessible.cpp +++ b/src/plugins/accessible/shared/qqmlaccessible.cpp @@ -87,7 +87,6 @@ QAccessibleInterface *QQmlAccessible::childAt(int x, int y) const if (childIface->rect().contains(x, y)) return childIface; } - delete childIface; } return 0; } |