summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-03-05 03:37:14 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-03-05 03:37:14 (GMT)
commitc7ac041e5180d118e300a050d9c579467230a48c (patch)
tree396f19b89df7a8da97f459385f4f5ceff58ccede /src/network
parent9b7e3943b0e67af48fdbb993c5c4cc93dac81304 (diff)
parenta2e7ab8926c5e8a4c89bb017bbcacfcfbf43ef25 (diff)
downloadQt-c7ac041e5180d118e300a050d9c579467230a48c.zip
Qt-c7ac041e5180d118e300a050d9c579467230a48c.tar.gz
Qt-c7ac041e5180d118e300a050d9c579467230a48c.tar.bz2
Merge remote branch 'staging/4.7' into bearermanagement/polling
Diffstat (limited to 'src/network')
-rw-r--r--src/network/bearer/qnetworksession.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp
index 27922af..cf9f4b2 100644
--- a/src/network/bearer/qnetworksession.cpp
+++ b/src/network/bearer/qnetworksession.cpp
@@ -541,7 +541,7 @@ QVariant QNetworkSession::sessionProperty(const QString& key) const
\a key. Removing an already set property can be achieved by passing an
invalid QVariant.
- Note that the \i UserChoiceConfiguration and \i ActiveConfiguration
+ Note that the \e UserChoiceConfiguration and \e ActiveConfiguration
properties are read only and cannot be changed using this method.
*/
void QNetworkSession::setSessionProperty(const QString& key, const QVariant& value)