summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2012-06-18 16:39:25 +1000
committerQt Continuous Integration System <qt-info@nokia.com>2012-06-18 16:39:25 +1000
commit146c0c7be3e90ee2a1b54556dfb8c038818819e6 (patch)
treea7996367e06fa763e7c3712e7325b19b8fcce173
parent790e1506954054c7f2cc2361ccc697fd03dcc7ae (diff)
parent50b945e17c5bb92159fe7cb51bfadb094e4a5cd5 (diff)
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: Document update for messaging
-rw-r--r--src/messaging/qmessagemanager.cpp2
-rw-r--r--src/messaging/qmessageservice.cpp2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/messaging/qmessagemanager.cpp b/src/messaging/qmessagemanager.cpp
index c3d19739be..758164aeaf 100644
--- a/src/messaging/qmessagemanager.cpp
+++ b/src/messaging/qmessagemanager.cpp
@@ -95,6 +95,8 @@ QTM_BEGIN_NAMESPACE
Messaging store manipulations involving messages are reported via the messagesAdded(),
messagesUpdated() and messagesRemoved() signals.
+ \warning On Symbian this class does not support QObject::moveToThread().
+
\sa QMessage, QMessageId, QMessageContentContainerId, QMessageService
*/
diff --git a/src/messaging/qmessageservice.cpp b/src/messaging/qmessageservice.cpp
index e7173db32c..5bfed52022 100644
--- a/src/messaging/qmessageservice.cpp
+++ b/src/messaging/qmessageservice.cpp
@@ -88,6 +88,8 @@ QTM_BEGIN_NAMESPACE
Other functions in the mobility messaging API will not initiate network
activity, with the exception of Windows mobile and desktop platforms which
may initiate network activity during the evaluation of any function call.
+
+ \warning On Symbian this class does not support QObject::moveToThread().
*/
/*!