diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-11-02 00:45:25 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-11-02 00:45:25 (GMT) |
| commit | 13eebf835df3d8fec88a68b571d33e73da929413 (patch) | |
| tree | 707d8b3f08ae56d80e9e1e06de326e9f856e1016 /src/declarative | |
| parent | 155065cd5c611e2d14357a8ff3180ac14a68e3a0 (diff) | |
| parent | 8e2b95b1115bc07f81d0fa22cc2929bb28d3e9bb (diff) | |
| download | Qt-13eebf835df3d8fec88a68b571d33e73da929413.zip Qt-13eebf835df3d8fec88a68b571d33e73da929413.tar.gz Qt-13eebf835df3d8fec88a68b571d33e73da929413.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
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) { |