summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qnamespace.qdoc
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-06-20 16:13:38 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-06-20 16:13:38 +0200
commit533820320c30fca6028415321d1a3b937a261088 (patch)
tree1a0eebcc5f5729f5a9d2f00b080c5fcf1cd15c6f /src/corelib/global/qnamespace.qdoc
parent25739bebba0343a8b35775a073c49f0fba080762 (diff)
parent172fa29dffef0eb55378f62b3ea1c18810639b3f (diff)
Merge remote-tracking branch 'origin/release' into stable
Diffstat (limited to 'src/corelib/global/qnamespace.qdoc')
-rw-r--r--src/corelib/global/qnamespace.qdoc1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 9eb0c6b8f2..f9248eb68d 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -1621,6 +1621,7 @@
\value Key_TouchpadToggle
\value Key_TouchpadOn
\value Key_TouchpadOff
+ \value Key_MicMute
\value Key_MediaLast
\value Key_unknown