summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-01-19 19:49:19 +1000
committerQt Continuous Integration System <qt-info@nokia.com>2011-01-19 19:49:19 +1000
commitdf6d56c173a960e59273f1567fad10f39640dbed (patch)
tree442975842b1a95ca7d74587f788adf82a8c26d00 /doc/src
parent587b48803b772a71ac9f783b1ff1400e247845ef (diff)
parentdd129a59296968b88ee01d82a87cb2c4644ae889 (diff)
Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-publishsubscribe into master-integration
* 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-publishsubscribe: Correcting summary and link to reflect status of ContextKit layer
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/publ-subs.qdoc7
1 files changed, 3 insertions, 4 deletions
diff --git a/doc/src/publ-subs.qdoc b/doc/src/publ-subs.qdoc
index 3b06843934..de3fe50c79 100644
--- a/doc/src/publ-subs.qdoc
+++ b/doc/src/publ-subs.qdoc
@@ -136,10 +136,9 @@ The Shared Memory layer has an order of 0x10000000.
on Windows platforms.
The Non-volatile Registry layer has an order of 0.
\row
- \o ContextKit Layer
+ \o \l{ContextKit Layer}
\o The ContextKit layer provides a non-permanent Value Space backing store using
- ContextKit. Publishing values to this layer via QValueSpacePublisher is currently not
- supported.
+ ContextKit. This layer is only available on MeeGo and Maemo platforms.
The ContextKit layer has an order of 0.
\row
\o \l{Symbian Settings Layer}
@@ -259,7 +258,7 @@ converted back to the original data types. The serialization/deserialization is
to the API user but may cause interoperatibility issues with native applications that access the same
data directly.
-\section2 ContextKit Layer (Maemo6/MeeGo)
+\section2 ContextKit Layer
Publish and Subscribe can be used to access both "core" and "non-core" values in the MeeGo ContextKit.
The backend by default will look for a "core" property in the registry first (dot-separated), and then