diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-29 12:11:53 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-29 12:11:53 +0200 |
| commit | d0c48efbae386dc88ea2313264e739715d9154b4 (patch) | |
| tree | 97a30a0c58c8ecb8a9a58ae892f53c6e9efe03d7 /src/widgets/kernel/qapplication.h | |
| parent | e35a83b293e6b38f6060895262b5494d36515e6e (diff) | |
| parent | d7305c10948f501450b6b3358d261217d13c6d6e (diff) | |
Merge remote branch 'gerrit/master' into refactor
Conflicts:
src/gui/accessible/qaccessible.h
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication.h
src/gui/kernel/qapplication_mac.mm
src/gui/kernel/qapplication_qws.cpp
src/gui/kernel/qapplication_s60.cpp
src/gui/kernel/qapplication_win.cpp
src/gui/kernel/qapplication_x11.cpp
src/gui/kernel/qdnd_x11.cpp
src/gui/kernel/qwidget.cpp
src/gui/widgets/qlabel.cpp
Change-Id: Ief9c75724d2cff89ed45f009bdee2ffc5e4395ba
Diffstat (limited to 'src/widgets/kernel/qapplication.h')
| -rw-r--r-- | src/widgets/kernel/qapplication.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h index c7ec35c83d..aec2c07763 100644 --- a/src/widgets/kernel/qapplication.h +++ b/src/widgets/kernel/qapplication.h @@ -200,6 +200,7 @@ public: static void alert(QWidget *widget, int duration = 0); static Qt::KeyboardModifiers keyboardModifiers(); + static Qt::KeyboardModifiers queryKeyboardModifiers(); static Qt::MouseButtons mouseButtons(); static void setDesktopSettingsAware(bool); |