diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-07-20 10:58:32 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-07-20 10:58:32 (GMT) |
| commit | 3552343a19a0f1a694c2e61b81e63ecf758978cc (patch) | |
| tree | 7b0c3116b4f95534a5e61d110669eabfd8166cef /src/plugins | |
| parent | 2d01152b7ae3884473874a80b3b8cfd7f00c4b72 (diff) | |
| parent | 64b9e63f4f9162c1af299b1355e84b0e616ad768 (diff) | |
| download | Qt-3552343a19a0f1a694c2e61b81e63ecf758978cc.zip Qt-3552343a19a0f1a694c2e61b81e63ecf758978cc.tar.gz Qt-3552343a19a0f1a694c2e61b81e63ecf758978cc.tar.bz2 | |
Merge branch 'QTBUG-6843' into 4.7
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/accessible/widgets/qaccessiblewidgets.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp index 499eb1d..662663d 100644 --- a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp +++ b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp @@ -984,7 +984,7 @@ int QAccessibleDockWidget::childCount() const int QAccessibleDockWidget::indexOfChild(const QAccessibleInterface *child) const { if (child) { - if (qobject_cast<QDockWidget *>(child->object()) == dockWidget() && child->role(0) == TitleBar) { + if (child->role(0) == TitleBar) { return 1; } else { return 2; //### @@ -1214,7 +1214,7 @@ int QAccessibleTitleBar::childAt(int x, int y) const QObject *QAccessibleTitleBar::object() const { - return m_dockWidget; + return 0; } QDockWidgetLayout *QAccessibleTitleBar::dockWidgetLayout() const |