diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2012-01-25 14:43:07 +1000 |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2012-01-25 14:43:07 +1000 |
commit | c3601a8db91bc777ea859d6a796dfab6a218675e (patch) | |
tree | d2a4f6c83bec3cddcce020966cccac72be3aa04a /src/plugins/accessible/shared | |
parent | 35794301d188b731a7b596d92fc632fff58586c0 (diff) | |
parent | 149f6afe321ce59aebe4ce2f9dddd1881d0ac22b (diff) |
Merge branch 'master' into animation-refactorwip/animation-refactor
Conflicts:
tests/auto/declarative/declarative.pro
Change-Id: Ie339be2989fac553d351f3077869f1847367b504
Diffstat (limited to 'src/plugins/accessible/shared')
-rw-r--r-- | src/plugins/accessible/shared/qdeclarativeaccessible.cpp | 7 | ||||
-rw-r--r-- | src/plugins/accessible/shared/qdeclarativeaccessible.h | 3 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/plugins/accessible/shared/qdeclarativeaccessible.cpp b/src/plugins/accessible/shared/qdeclarativeaccessible.cpp index eba6a006d1..267f819a6d 100644 --- a/src/plugins/accessible/shared/qdeclarativeaccessible.cpp +++ b/src/plugins/accessible/shared/qdeclarativeaccessible.cpp @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the QtDeclarative module of the Qt Toolkit. ** @@ -63,11 +63,6 @@ QDeclarativeAccessible::~QDeclarativeAccessible() { } -QFlags<QAccessible::RelationFlag> QDeclarativeAccessible::relationTo(const QAccessibleInterface *) const -{ - return QAccessible::Unrelated; -} - QAccessibleInterface *QDeclarativeAccessible::childAt(int x, int y) const { // Note that this function will disregard stacking order. diff --git a/src/plugins/accessible/shared/qdeclarativeaccessible.h b/src/plugins/accessible/shared/qdeclarativeaccessible.h index d86d6a14c2..924582a49e 100644 --- a/src/plugins/accessible/shared/qdeclarativeaccessible.h +++ b/src/plugins/accessible/shared/qdeclarativeaccessible.h @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the QtDeclarative module of the Qt Toolkit. ** @@ -76,7 +76,6 @@ public: ~QDeclarativeAccessible(); virtual QRect viewRect() const = 0; - QFlags<QAccessible::RelationFlag> relationTo(const QAccessibleInterface*) const; QAccessibleInterface *childAt(int, int) const; QAccessible::State state() const; |