diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-12 15:16:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-12 15:16:09 (GMT) |
| commit | 647c618da0024373fd866999e7603cbf36cc855e (patch) | |
| tree | 242028ddfcd853158a42183d997567f0d731de66 /src/corelib/global | |
| parent | 7f889e1b6b6f01e6ff0775d41316ecb80e534abd (diff) | |
| parent | 1a1b2af1ce2cf9acfda80947f04718a7dc2fff35 (diff) | |
| download | Qt-647c618da0024373fd866999e7603cbf36cc855e.zip Qt-647c618da0024373fd866999e7603cbf36cc855e.tar.gz Qt-647c618da0024373fd866999e7603cbf36cc855e.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Fix license header in qs60keycapture_p.h and qs60keycapture.cpp
Fixing WINSCW compile error
whitespace fixes
Enable key capture and RemCon interfaces for Qt apps on Symbian
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 1 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 99479d0..e247533 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -546,6 +546,7 @@ public: AA_S60DontConstructApplicationPanes = 8, AA_S60DisablePartialScreenInputMode = 9, AA_X11InitThreads = 10, + AA_CaptureMultimediaKeys = 11, // Add new attributes before this line AA_AttributeCount diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index ad9e113..dc92866 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -171,6 +171,15 @@ construction in order to make Xlib calls thread-safe. This attribute must be set before QApplication is constructed. + \value AA_CaptureMultimediaKeys Enables application to receive multimedia key events + (play, next, previous etc). This includes also external sources such as headsets. + Application can not use Remote Control framework on Symbian if this attribute is + set. On Symbian, multimedia key event routing may vary between different devices. + For example, application on background may receive multimedia key events only if + it has active audio stream i.e. it is playing music or video. This attribute must + be set before QApplication is constructed. This attribute is only supported in Symbian + platform. + \omitvalue AA_AttributeCount */ |