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:
  Improve GeneralInfo QML Element documentation.
  Improve StorageInfo QML element documentation
  Clarify QContactManagerEngine::waitForRequestFinished documentation
  Added missing since tags to QContactFetchHint documentation
  Clarify what is included in QContactDetail default schema.
  Improve GeneralInfo QML Element documentation.
  Improve NetworkInfo QML element documentation
  Clarify FeedbackEffect documentation

2 files changed, 58 insertions, 18 deletions

diff --git a/plugins/declarative/systeminfo/qdeclarativegeneralinfo.cpp b/plugins/declarative/systeminfo/qdeclarativegeneralinfo.cpp
index 7ef83661dc..be5469daec 100644
--- a/plugins/declarative/systeminfo/qdeclarativegeneralinfo.cpp
+++ b/plugins/declarative/systeminfo/qdeclarativegeneralinfo.cpp
@@ -78,7 +78,7 @@ Q_GLOBAL_STATIC(QSystemInfo, generalInfo)
 
 
 /*!
-    \qmlsignal SystemInfo::startCurrentLanguageChanged()
+    \qmlsignal GeneralInfo::currentLanguageChanged(string language)
     \since Mobility 1.1
 
     This handler is called when current system language has changed.
@@ -89,6 +89,12 @@ QDeclarativeGeneralInfo::QDeclarativeGeneralInfo(QObject *parent) :
 {
 }
 
+/*!
+    \qmlmethod void GeneralInfo::startCurrentLanguageChanged()
+    \since Mobility 1.1
+
+    Start the connection for the currentLanguageChanged signal.
+*/
 void QDeclarativeGeneralInfo::startCurrentLanguageChanged()
 {
     connect(generalInfo(),SIGNAL(currentLanguageChanged(QString)),
@@ -102,7 +108,7 @@ void QDeclarativeGeneralInfo::declarativeCurrentLanguageChanged(const QString &l
 }
 
 /*!
-  \qmlproperty string QDeclarativeGeneralInfo::osVersion
+  \qmlproperty string GeneralInfo::osVersion
   \since Mobility 1.1
 
    Returns the version of the Operating System.
@@ -113,7 +119,7 @@ QString QDeclarativeGeneralInfo::osVersion()
 }
 
 /*!
-  \qmlproperty string QDeclarativeGeneralInfo::qtCoreVersion
+  \qmlproperty string GeneralInfo::qtCoreVersion
   \since Mobility 1.1
 
    Returns the version of the installed Qt Core library.
@@ -124,7 +130,7 @@ QString QDeclarativeGeneralInfo::qtCoreVersion()
 }
 
 /*!
-  \qmlproperty string QDeclarativeGeneralInfo::firmwareVersion
+  \qmlproperty string GeneralInfo::firmwareVersion
   \since Mobility 1.1
 
    Returns the version of the firmware as a whole.
@@ -135,7 +141,7 @@ QString QDeclarativeGeneralInfo::firmwareVersion()
 }
 
 /*!
-  \qmlproperty string QDeclarativeGeneralInfo::qtMobilityVersion
+  \qmlproperty string GeneralInfo::qtMobilityVersion
   \since Mobility 1.1
 
    Returns the version of the installed Qt Mobility library.
@@ -145,3 +151,22 @@ QString QDeclarativeGeneralInfo::qtMobilityVersion()
     return generalInfo()->version(QSystemInfo::QtMobility);
 }
 
+/*!
+    \qmlproperty string GeneralInfo::currentLanguage
+    \since Mobility 1.1
+    Returns the current language in two letter ISO 639-1 format.
+ */
+
+/*!
+    \qmlproperty list GeneralInfo::availableLanguages
+    \since Mobility 1.1
+    Returns a QStringList of available Qt language translations in two letter ISO 639-1 format.
+    If the Qt translations cannot be found, returns the current system language.
+*/
+
+/*!
+    \qmlproperty string GeneralInfo::currentCountryCode
+    \since Mobility 1.1
+    Returns the two letter ISO 3166-1 for the current country code.
+*/
+
diff --git a/plugins/declarative/systeminfo/qdeclarativenetworkinfo.cpp b/plugins/declarative/systeminfo/qdeclarativenetworkinfo.cpp
index 3f1c034d43..0a65c68a04 100644
--- a/plugins/declarative/systeminfo/qdeclarativenetworkinfo.cpp
+++ b/plugins/declarative/systeminfo/qdeclarativenetworkinfo.cpp
@@ -150,21 +150,21 @@ QtMobility 1.2:
 \sa QSystemNetworkInfo
 */
 /*!
-    \qmlsignal NetworkInfo::statusChanged()
+    \qmlsignal NetworkInfo::statusChanged(string networkStatus)
     \since Mobility 1.1
 
     This handler is called when network status has changed.
     Note: To receive this notification, you must first call \a startStatusChanged.
 */
 /*!
-    \qmlsignal NetworkInfo::signalStrengthChanged()
+    \qmlsignal NetworkInfo::signalStrengthChanged(int signalStrength)
     \since Mobility 1.1
 
     This handler is called when network signal strength has changed.
     Note: To receive this notification, you must first call \a startSignalStrengthChanged.
 */
 /*!
-    \qmlsignal NetworkInfo::nameChanged()
+    \qmlsignal NetworkInfo::nameChanged(string networkName)
     \since Mobility 1.1
 
     This handler is called when network name has changed.
@@ -178,19 +178,33 @@ QtMobility 1.2:
     Note: To receive this notification, you must first call \a startModeChanged.
 */
 /*!
-    \qmlsignal NetworkInfo::currentMobileCountryCodeChanged()
+    \qmlsignal NetworkInfo::currentMobileCountryCodeChanged(string mcc)
     \since Mobility 1.1
 
     This handler is called when network MCC has changed.
     Note: To receive this notification, you must first call \a startCurrentMobileCountryCodeChanged.
 */
 /*!
-    \qmlsignal NetworkInfo::currentMobileNetworkCodeChanged()
+    \qmlsignal NetworkInfo::currentMobileNetworkCodeChanged(string mnc)
     \since Mobility 1.1
 
     This handler is called when network MNC has changed.
     Note: To receive this notification, you must first call \a startCurrentMobileNetworkCodeChanged.
 */
+/*!
+    \qmlsignal NetworkInfo::cellIdChanges(int cellId)
+    \since Mobility 1.1
+
+    This handler is called when cell id has changed.
+    Note: To receive this notification, you must first call \a startCellIdChanged.
+*/
+/*!
+    \qmlsignal NetworkInfo::cellDataTechnologyChanges(QSystemNetworkInfo::CellDataTechnology cellTech)
+    \since Mobility 1.1
+
+    This handler is called when cell data technology has changed.
+    Note: To receive this notification, you must first call \a startCellDataChanged.
+*/
 
 QDeclarativeNetworkInfo::QDeclarativeNetworkInfo(QObject *parent) :
     QSystemNetworkInfo(parent)
@@ -324,7 +338,7 @@ void QDeclarativeNetworkInfo::startStatusChanged(bool on)
 
 /*!
     \qmlproperty bool NetworkInfo::monitorStatusChanges
-    \brief Use the statusChanged signal.
+    Use the statusChanged signal.
     \since Mobility 1.2
     */
 bool QDeclarativeNetworkInfo::monitorStatusChanges()
@@ -352,7 +366,7 @@ void QDeclarativeNetworkInfo::startSignalStrengthChanged(bool on)
 
 /*!
     \qmlproperty bool NetworkInfo::monitorSignalStrengthChanges
-    \brief Use the signalStrengthChanged signal.
+    Use the signalStrengthChanged signal.
     \since Mobility 1.2
     */
 bool QDeclarativeNetworkInfo::monitorSignalStrengthChanges()
@@ -380,7 +394,7 @@ void QDeclarativeNetworkInfo::startNameChanged(bool on)
 
 /*!
     \qmlproperty bool NetworkInfo::monitorNameChanges
-    \brief Use the nameChanged signal.
+    Use the nameChanged signal.
     \since Mobility 1.2
     */
 bool QDeclarativeNetworkInfo::monitorNameChanges()
@@ -408,6 +422,7 @@ void QDeclarativeNetworkInfo::startModeChanged(bool on)
 
 /*!
     \qmlproperty bool NetworkInfo::monitorModeChanges
+    Use the modeChanged signal.
     \since Mobility 1.2
     */
 bool QDeclarativeNetworkInfo::monitorModeChanges()
@@ -436,7 +451,7 @@ void QDeclarativeNetworkInfo::startCurrentMobileCountryCodeChanged(bool on)
 
 /*!
     \qmlproperty bool NetworkInfo::monitorCurrentMobileCountryCodeChanges
-    \brief Use the monitoringCurrentMobileCountryCodeChanged signal.
+    Use the currentMobileCountryCodeChanged signal.
     \since Mobility 1.2
     */
 bool QDeclarativeNetworkInfo::monitorCurrentMobileCountryCodeChanges()
@@ -464,7 +479,7 @@ void QDeclarativeNetworkInfo::startCurrentMobileNetworkCodeChanged(bool on)
 
 /*!
     \qmlproperty bool NetworkInfo::monitorCurrentMobileNetworkCodeChanges
-    \brief Use the monitorCurrentMobileNetworkCodeChanged signal.
+    Use the currentMobileNetworkCodeChanged signal.
     \since Mobility 1.2
     */
 bool QDeclarativeNetworkInfo::monitorCurrentMobileNetworkCodeChanges()
@@ -616,8 +631,8 @@ QSystemNetworkInfo::NetworkMode QDeclarativeNetworkInfo::mode()
 
 
 /*!
-    \qmlproperty bool NetworkInfo::monitorCellDataTechnologyChanges
-    \brief Use the cellDataTechnologyChanges signal.
+    \qmlproperty bool NetworkInfo::monitorCellDataChanges
+    Use the cellDataTechnologyChanges signal.
     \since Mobility 1.2
 
    \sa QSystemNetworkInfo::cellDataTechnologyChanged
@@ -646,7 +661,7 @@ void QDeclarativeNetworkInfo::startCellDataChanged(bool on)
 
 /*!
     \qmlproperty bool NetworkInfo::monitorCellIdChanges
-    \brief Use the cellIdChanges signal.
+    Use the cellIdChanges signal.
     \since Mobility 1.2
     */
 bool QDeclarativeNetworkInfo::monitorCellIdChanges()