diff options
| author | jasplin <qt-info@nokia.com> | 2009-05-14 13:45:21 (GMT) |
|---|---|---|
| committer | jasplin <qt-info@nokia.com> | 2009-05-14 13:52:42 (GMT) |
| commit | f09304d46bac91f3e8329cb7147f8df44898d1e0 (patch) | |
| tree | 885da3b68f3894d9a03398ce6c06261c7390d2a6 /src/gui/kernel | |
| parent | 9fa45f00eedb72f7313b6633ba8381fc1afee473 (diff) | |
| download | Qt-f09304d46bac91f3e8329cb7147f8df44898d1e0.zip Qt-f09304d46bac91f3e8329cb7147f8df44898d1e0.tar.gz Qt-f09304d46bac91f3e8329cb7147f8df44898d1e0.tar.bz2 | |
Fixed regression that prevented any widget from having focus when graphics view was disabled.
A bug in Commit d5c018f7b014ab794e49d6e1f24e02233555847d prevented any
widget from having focus when QT_NO_GRAPHICSVIEW was defined.
This patch fixes the bug.
Reviewed-by: bnilsen
Task-number: 249589
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qapplication.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index f3bd57b..4cf0ad7 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -2032,12 +2032,10 @@ QWidget *QApplication::focusWidget() void QApplicationPrivate::setFocusWidget(QWidget *focus, Qt::FocusReason reason) { - if (focus && focus->window() #ifndef QT_NO_GRAPHICSVIEW - && focus->window()->graphicsProxyWidget() -#endif - ) + if (focus && focus->window()->graphicsProxyWidget()) return; +#endif hidden_focus_widget = 0; |