1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accessibility: Menu item should keep track of owner being valid

Browse Source 
The QAction may stay around while the parent/owner gets deleted.
This is for example the case for some dynamically created menus.

This is required for fixing QTBUG-30792

Change-Id: I7b6122edec6def69aed77502403134e1568e21c9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
This commit is contained in:
Frederik Gladhorn 2013-04-22 15:51:05 +02:00 committed by The Qt Project
parent 8d60a10462
commit a7ce34dba4
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/accessible/widgets/qaccessiblemenu.cpp
View File

@ -206,7 +206,7 @@ int QAccessibleMenuItem::indexOfChild(const QAccessibleInterface * child) const
bool QAccessibleMenuItem::isValid() const bool QAccessibleMenuItem::isValid() const
{ {
return m_action ? true : false; return m_action && m_owner ? true : false;
} }
QAccessibleInterface *QAccessibleMenuItem::parent() const QAccessibleInterface *QAccessibleMenuItem::parent() const

3
src/plugins/accessible/widgets/qaccessiblemenu.h
View File

@ -43,6 +43,7 @@
#define QACCESSIBLEMENU_H #define QACCESSIBLEMENU_H
#include <QtWidgets/private/qaccessiblewidget_p.h> #include <QtWidgets/private/qaccessiblewidget_p.h>
#include <QtCore/qpointer.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -120,7 +121,7 @@ protected:
QAction *action() const; QAction *action() const;
private: private:
QAction *m_action; QAction *m_action;
QWidget *m_owner; // can hold either QMenu or the QMenuBar that contains the action QPointer<QWidget> m_owner; // can hold either QMenu or the QMenuBar that contains the action
}; };
#endif // QT_NO_MENU #endif // QT_NO_MENU