diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-04-16 12:04:34 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2012-04-16 12:04:34 +0200 |
| commit | 9bd032355163d92cda5e7e59ecd21214b131f187 (patch) | |
| tree | 002fa12558505683143c7eb08949a3d225bf0712 /src/plugins/accessible/widgets/qaccessiblemenu.cpp | |
| parent | d037d25c3d5236623371cf051aaf6a9e59792ba7 (diff) | |
| parent | 41673c45dde2eb95ee21dd918235218399f2be2c (diff) | |
Merge remote-tracking branch 'origin/master' into api_changes
Conflicts:
configure
src/corelib/io/qurl.cpp
src/gui/kernel/qwindow.cpp
src/tools/moc/generator.cpp
src/widgets/kernel/qwidget_qpa.cpp
src/widgets/styles/qstyle.h
src/widgets/widgets/qtabbar.cpp
tests/auto/corelib/codecs/utf8/tst_utf8.cpp
Change-Id: Ia457228d6f684ec8184e13e8fcc9d25857b1751e
Diffstat (limited to 'src/plugins/accessible/widgets/qaccessiblemenu.cpp')
| -rw-r--r-- | src/plugins/accessible/widgets/qaccessiblemenu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/accessible/widgets/qaccessiblemenu.cpp b/src/plugins/accessible/widgets/qaccessiblemenu.cpp index d3ca1629bd..6009d25977 100644 --- a/src/plugins/accessible/widgets/qaccessiblemenu.cpp +++ b/src/plugins/accessible/widgets/qaccessiblemenu.cpp @@ -249,7 +249,7 @@ QAccessible::State QAccessibleMenuItem::state() const QAccessible::State s; QWidget *own = owner(); - if (own->testAttribute(Qt::WA_WState_Visible) == false || m_action->isVisible() == false) { + if (own && own->testAttribute(Qt::WA_WState_Visible) == false || m_action->isVisible() == false) { s.invisible = true; } @@ -262,7 +262,7 @@ QAccessible::State QAccessibleMenuItem::state() const s.focused = true; #endif } - if (own->style()->styleHint(QStyle::SH_Menu_MouseTracking)) + if (own && own->style()->styleHint(QStyle::SH_Menu_MouseTracking)) s.hotTracked = true; if (m_action->isSeparator() || !m_action->isEnabled()) s.disabled = true; |