summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authorHonglei Zhang <honglei.zhang@nokia.com>2011-07-04 11:21:16 (GMT)
committerHonglei Zhang <honglei.zhang@nokia.com>2011-07-04 11:21:16 (GMT)
commitbad513727833e207f7f8ca0d7c07c44c1addfb57 (patch)
tree4360dbcc6197deef74acaec2fa3044dae04b60b1 /src/corelib/global
parent482d3d048f96509c2b90096475eb7b1401c4a04c (diff)
parent3b6a61953bcd319a6df55d66116ce92f7525ec00 (diff)
downloadQt-bad513727833e207f7f8ca0d7c07c44c1addfb57.zip
Qt-bad513727833e207f7f8ca0d7c07c44c1addfb57.tar.gz
Qt-bad513727833e207f7f8ca0d7c07c44c1addfb57.tar.bz2
Merge branch 'newmmkey_sym'
Diffstat (limited to 'src/corelib/global')
-rw-r--r--src/corelib/global/qnamespace.h1
-rw-r--r--src/corelib/global/qnamespace.qdoc9
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 9f59c6e..7d3b7f6 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -167,6 +167,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
*/