summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorjasplin <qt-info@nokia.com>2009-05-12 07:47:29 (GMT)
committerjasplin <qt-info@nokia.com>2009-05-12 07:54:19 (GMT)
commit8d94fcce0a2ca382eac8357dae05ad387551e364 (patch)
tree21f77cfdbc92b5bb4e4584921d67a9df4b5fbc21 /src/gui
parent7f0ffec90467c12d41566bb20fc02e09cfe3afa1 (diff)
downloadQt-8d94fcce0a2ca382eac8357dae05ad387551e364.zip
Qt-8d94fcce0a2ca382eac8357dae05ad387551e364.tar.gz
Qt-8d94fcce0a2ca382eac8357dae05ad387551e364.tar.bz2
Fixed bug with Qt::WidgetWithChildren shortcut context in QGraphicsWidget.
For a QGraphicsWidget w, a shortcut with Qt::WidgetWithChildren context would trigger even if w did not have focus (provided no other widgets in the view had focus). Reviewed-by: andreas Task-number: 250119
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/kernel/qshortcutmap.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/kernel/qshortcutmap.cpp
index ed9654b..86894b4 100644
--- a/src/gui/kernel/qshortcutmap.cpp
+++ b/src/gui/kernel/qshortcutmap.cpp
@@ -753,6 +753,7 @@ bool QShortcutMap::correctGraphicsWidgetContext(Qt::ShortcutContext context, QGr
tw = tw->parentWidget();
return tw == w;
}
+ return false;
}
// Below is Qt::WindowShortcut context