Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-systeminfo into master-integration

* 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-systeminfo:
  Symbian documentation update for System Information
  Symbian documentation update for QValueSpacePublisher
  Symbian documentation update for DocumentGalleryModel

6 files changed, 14 insertions, 5 deletions

diff --git a/plugins/declarative/gallery/qdeclarativegalleryquerymodel.cpp b/plugins/declarative/gallery/qdeclarativegalleryquerymodel.cpp
index 439ee363e9..f319a137fc 100644
--- a/plugins/declarative/gallery/qdeclarativegalleryquerymodel.cpp
+++ b/plugins/declarative/gallery/qdeclarativegalleryquerymodel.cpp
@@ -658,6 +658,12 @@ void QDeclarativeDocumentGalleryModel::classBegin()
     \endlist
 
     The default value is DocumentGallery.File
+    
+    \note On Symbian following rootTypes are not supported: DocumentGallery.Folder, DocumentGallery.Document, DocumentGallery.Text, and DocumentGallery.Playlist.
+    
+    \note In some S60 5th Edition (early release) Symbian devices the platform backend requires ReadDeviceData capability to be defined. 
+    In addition, in these devices DocumentGallery.Audio rootType is not supported. 
+    
 */
 
 QDeclarativeDocumentGallery::ItemType QDeclarativeDocumentGalleryModel::rootType() const
diff --git a/src/publishsubscribe/qvaluespacepublisher.cpp b/src/publishsubscribe/qvaluespacepublisher.cpp
index 65f20ae13e..b5f373cbec 100644
--- a/src/publishsubscribe/qvaluespacepublisher.cpp
+++ b/src/publishsubscribe/qvaluespacepublisher.cpp
@@ -304,9 +304,8 @@ void QValueSpacePublisher::sync()
 }
 
 /*!
-    Sets the value \a name on the publisher to \a data.  If name is empty, this call will set the
-    value of this publisher's path.
-
+    Sets the value \a name on the publisher to \a data.  If name is empty, nothing is done.
+    
     For example:
 
     \code
diff --git a/src/systeminfo/qsystembatteryinfo.cpp b/src/systeminfo/qsystembatteryinfo.cpp
index ceecfa1c87..2dac7e4f99 100644
--- a/src/systeminfo/qsystembatteryinfo.cpp
+++ b/src/systeminfo/qsystembatteryinfo.cpp
@@ -62,7 +62,7 @@ QSystemBatteryInfoPrivate *getSystemBatteryInfoPrivate() { return batteryInfoPri
 
     \reentrant
 
-    \note All functions in this class are reentrant.
+    \note All functions in this class are reentrant. However, in Symbian platform this class is not reentrant since Symbian Belle (Qt Mobility version 1.2).
 
     \warning On Symbian this class does not support QObject::moveToThread().
 
diff --git a/src/systeminfo/qsystemdeviceinfo.cpp b/src/systeminfo/qsystemdeviceinfo.cpp
index 801d10a258..c98328920b 100644
--- a/src/systeminfo/qsystemdeviceinfo.cpp
+++ b/src/systeminfo/qsystemdeviceinfo.cpp
@@ -61,7 +61,7 @@ QSystemDeviceInfoPrivate *getSystemDeviceInfoPrivate() { return deviceInfoPrivat
 
     \reentrant
 
-    \note All functions in this class are reentrant.
+    \note All functions in this class are reentrant. However, in Symbian platform this class is not reentrant since Symbian Belle (Qt Mobility version 1.2).
 
     \warning On Symbian this class does not support QObject::moveToThread().
 */
diff --git a/src/systeminfo/qsystemnetworkinfo.cpp b/src/systeminfo/qsystemnetworkinfo.cpp
index d7599cf534..d7af074dce 100644
--- a/src/systeminfo/qsystemnetworkinfo.cpp
+++ b/src/systeminfo/qsystemnetworkinfo.cpp
@@ -62,6 +62,8 @@ QSystemNetworkInfoPrivate *getSystemNetworkInfoPrivate() { return netInfoPrivate
     \reentrant
 
     \note Most functions in this class are reentrant on all platforms. The exceptions are listed below.
+    
+    \note In Symbian platform this class is not reentrant since Symbian Belle (Qt Mobility version 1.2).
 
     \warning On Symbian this class does not support QObject::moveToThread().
 
diff --git a/src/systeminfo/qsystemstorageinfo.cpp b/src/systeminfo/qsystemstorageinfo.cpp
index 5eb67fc3fb..55d91f45c1 100644
--- a/src/systeminfo/qsystemstorageinfo.cpp
+++ b/src/systeminfo/qsystemstorageinfo.cpp
@@ -63,6 +63,8 @@ QSystemStorageInfoPrivate *getSystemStorageInfoPrivate() { return storageInfoPri
     \reentrant
 
     \note Most functions in this class are reentrant on all platforms. The exceptions are listed below.
+    
+    \note In Symbian platform this class is not reentrant since Symbian Belle (Qt Mobility version 1.2).
 
     \warning On Symbian this class does not support QObject::moveToThread().
 */