diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-02 09:32:21 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-02 09:32:21 (GMT) |
| commit | 6a6093d69e2c3af9e66b6e2c364a7f2785c88d8a (patch) | |
| tree | 8089fc5a8205b117a722c3567cd733dad90dbceb /src | |
| parent | f309c1cc1b0212f1c882fca5adb0e7d7ef552de9 (diff) | |
| parent | d0c4433ca1aabab1a8fac1aae2ba65f25dae5f85 (diff) | |
| download | Qt-6a6093d69e2c3af9e66b6e2c364a7f2785c88d8a.zip Qt-6a6093d69e2c3af9e66b6e2c364a7f2785c88d8a.tar.gz Qt-6a6093d69e2c3af9e66b6e2c364a7f2785c88d8a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
doc: Fixed some qdoc errors.
qdoc: Second attempt, QML doc stuff.
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeitem.cpp | 2 | ||||
| -rw-r--r-- | src/network/bearer/qnetworksession.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index f48c761..5014fd8 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -1172,7 +1172,7 @@ QDeclarativeKeysAttached *QDeclarativeKeysAttached::qmlAttachedProperties(QObjec See the \l {Keys}{Keys} attached property for detailed documentation. - \section 1 Property Change Signals + \section1 Property Change Signals Most properties on Item and Item derivatives have a signal emitted when they change. By convention, the signals are diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp index f0d7ede..047c8d3 100644 --- a/src/network/bearer/qnetworksession.cpp +++ b/src/network/bearer/qnetworksession.cpp @@ -527,7 +527,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) |