diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-04-07 22:56:10 (GMT) |
|---|---|---|
| committer | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-04-07 22:56:10 (GMT) |
| commit | 0b1dd92c46c91711b31e1d4bded5cb5145ae161b (patch) | |
| tree | 26b432a514d083e1136092cf59d576ee4498e056 /src/gui/kernel/qsoftkeymanager_common_p.h | |
| parent | 49218ff73ee151a5820d83c5ec87dc2cf0025235 (diff) | |
| parent | 7327d31b4e20bd4b3e3bad95c2fba3eb7a548dbb (diff) | |
| download | Qt-0b1dd92c46c91711b31e1d4bded5cb5145ae161b.zip Qt-0b1dd92c46c91711b31e1d4bded5cb5145ae161b.tar.gz Qt-0b1dd92c46c91711b31e1d4bded5cb5145ae161b.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6
Diffstat (limited to 'src/gui/kernel/qsoftkeymanager_common_p.h')
| -rw-r--r-- | src/gui/kernel/qsoftkeymanager_common_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/kernel/qsoftkeymanager_common_p.h b/src/gui/kernel/qsoftkeymanager_common_p.h index 460d0dc..04ddf7d 100644 --- a/src/gui/kernel/qsoftkeymanager_common_p.h +++ b/src/gui/kernel/qsoftkeymanager_common_p.h @@ -70,6 +70,7 @@ protected: static QSoftKeyManager *self; QHash<QAction*, Qt::Key> keyedActions; QMultiHash<int, QAction*> requestedSoftKeyActions; + QWidget *initialSoftKeySource; }; @@ -79,4 +80,4 @@ QT_END_NAMESPACE QT_END_HEADER -#endif // QSOFTKEYMANAGER_COMMON_P_H
\ No newline at end of file +#endif // QSOFTKEYMANAGER_COMMON_P_H |