diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-07-09 05:36:49 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-07-09 05:36:49 (GMT) |
| commit | 74a248462ef36f7784fd0816ee08030412459930 (patch) | |
| tree | ab41c0313467be480446397a8fe5463abee83035 /src/gui/kernel/qsoftkeymanager_common_p.h | |
| parent | 49b828102626ba6faa38ea48d9f570283dd7fa9f (diff) | |
| parent | 31cd8c15c0fdb2f08c2652609a57413a715d1b13 (diff) | |
| download | Qt-74a248462ef36f7784fd0816ee08030412459930.zip Qt-74a248462ef36f7784fd0816ee08030412459930.tar.gz Qt-74a248462ef36f7784fd0816ee08030412459930.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
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 |