diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-06-11 23:23:38 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-06-11 23:23:38 (GMT) |
| commit | b6cf52001e6c961f78fd3ebf19f09a94ddf52a97 (patch) | |
| tree | 958b0660a1d6313db9841f77693dd26ba0da05ff /src/gui/kernel/qshortcutmap.cpp | |
| parent | 344279da7e1cfbc4a28fd46931301d08ed9ef7d8 (diff) | |
| parent | 66f34c40dbc52b76434db4ccac6c43101bd57e1e (diff) | |
| download | Qt-b6cf52001e6c961f78fd3ebf19f09a94ddf52a97.zip Qt-b6cf52001e6c961f78fd3ebf19f09a94ddf52a97.tar.gz Qt-b6cf52001e6c961f78fd3ebf19f09a94ddf52a97.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
src/gui/graphicsview/qgraphicswidget.cpp
src/gui/painting/qdrawutil.cpp
src/gui/painting/qpainterpath.cpp
tools/qdoc3/test/qt-cpp-ignore.qdocconf
tools/qdoc3/test/qt-inc.qdocconf
Diffstat (limited to 'src/gui/kernel/qshortcutmap.cpp')
| -rw-r--r-- | src/gui/kernel/qshortcutmap.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/kernel/qshortcutmap.cpp index 3c2fcdd..735fe0f 100644 --- a/src/gui/kernel/qshortcutmap.cpp +++ b/src/gui/kernel/qshortcutmap.cpp @@ -628,13 +628,13 @@ QKeySequence::SequenceMatch QShortcutMap::matches(const QKeySequence &seq1, bool QShortcutMap::correctContext(const QShortcutEntry &item) const { Q_ASSERT_X(item.owner, "QShortcutMap", "Shortcut has no owner. Illegal map state!"); - QWidget *active_window = qApp->activeWindow(); + QWidget *active_window = QApplication::activeWindow(); // popups do not become the active window, // so we fake it here to get the correct context // for the shortcut system. - if (qApp->activePopupWidget()) - active_window = qApp->activePopupWidget(); + if (QApplication::activePopupWidget()) + active_window = QApplication::activePopupWidget(); if (!active_window) return false; |