diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-01 15:26:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-01 15:26:09 (GMT) |
| commit | a4f3cd9d7e67a8335d941321d7b8d6406d9907d6 (patch) | |
| tree | a808f038dd5f1b254d2f41d637c085b8ccbbc747 /src/declarative | |
| parent | d194ebdc199fdd85245bfecb766d836dfa79c3f3 (diff) | |
| parent | a1ae7da4cfc007b4ae32504af5b2ca9469b21401 (diff) | |
| download | Qt-a4f3cd9d7e67a8335d941321d7b8d6406d9907d6.zip Qt-a4f3cd9d7e67a8335d941321d7b8d6406d9907d6.tar.gz Qt-a4f3cd9d7e67a8335d941321d7b8d6406d9907d6.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:
QNAM HTTP: tst_qnetworkreply with setReadBufferSize() set
Fix compilation on AIX 5.3 with gcc
Doc: Fixed typo
Fix poor English in QStyle::polish documentation.
Fix a few typos in comments and docs.
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 0c99ea8..6906f21 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -608,7 +608,7 @@ QDeclarativeContext *QDeclarativeEngine::rootContext() const QNetworkAccessManager with specialized caching, proxy and cookie support. - The factory must be set before exceuting the engine. + The factory must be set before executing the engine. */ void QDeclarativeEngine::setNetworkAccessManagerFactory(QDeclarativeNetworkAccessManagerFactory *factory) { |