diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-07-12 02:38:13 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-07-12 02:38:13 (GMT) |
| commit | 60354895d4207a3198b2546e7b4dfcfa2051aa07 (patch) | |
| tree | d8855a64347c3033265c7bc3f280936451608649 /src/gui/kernel/qsoftkeymanager_common_p.h | |
| parent | 054049046e89d6e18d800f4728d4927354b640c6 (diff) | |
| parent | e45b8dceca9c424815c6b08355a95cb34382186c (diff) | |
| download | Qt-60354895d4207a3198b2546e7b4dfcfa2051aa07.zip Qt-60354895d4207a3198b2546e7b4dfcfa2051aa07.tar.gz Qt-60354895d4207a3198b2546e7b4dfcfa2051aa07.tar.bz2 | |
Merge remote branch 'oslo-staging-2/4.7' into qtbug-11996
Diffstat (limited to 'src/gui/kernel/qsoftkeymanager_common_p.h')
| -rw-r--r-- | src/gui/kernel/qsoftkeymanager_common_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qsoftkeymanager_common_p.h b/src/gui/kernel/qsoftkeymanager_common_p.h index 04ddf7d..1b364d4 100644 --- a/src/gui/kernel/qsoftkeymanager_common_p.h +++ b/src/gui/kernel/qsoftkeymanager_common_p.h @@ -71,7 +71,7 @@ protected: QHash<QAction*, Qt::Key> keyedActions; QMultiHash<int, QAction*> requestedSoftKeyActions; QWidget *initialSoftKeySource; - + bool pendingUpdate; }; QT_END_NAMESPACE |