diff options
| author | Martin Smith <msmith@trolltech.com> | 2009-05-19 09:52:23 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2009-05-19 09:52:23 (GMT) |
| commit | eaee2e3b70a5e245b82fa8991d7ff580e6e48132 (patch) | |
| tree | a86fa7fd804f80c30fe996f711aa02f2c00500b9 /src/gui/kernel/qapplication.cpp | |
| parent | ffecdf0bf9f25f7ab9aa4f69e37507dd595fecea (diff) | |
| parent | ba5fb9f05c891feac8ab69006189de1aaafebc18 (diff) | |
| download | Qt-eaee2e3b70a5e245b82fa8991d7ff580e6e48132.zip Qt-eaee2e3b70a5e245b82fa8991d7ff580e6e48132.tar.gz Qt-eaee2e3b70a5e245b82fa8991d7ff580e6e48132.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src/gui/kernel/qapplication.cpp')
| -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; |