diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-03 23:00:16 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-03 23:00:16 (GMT) |
| commit | a6733f5e70c6a4f3695dc380d1960d59f60e38b9 (patch) | |
| tree | 6da80ff96b48224bf33580a9189bf25a638be77e /src | |
| parent | c343e2139b1764008b812ee6cc3a2a980fa4d147 (diff) | |
| parent | 14e4fd08ff67578dccf5e85a88fcadf747ae5852 (diff) | |
| download | Qt-a6733f5e70c6a4f3695dc380d1960d59f60e38b9.zip Qt-a6733f5e70c6a4f3695dc380d1960d59f60e38b9.tar.gz Qt-a6733f5e70c6a4f3695dc380d1960d59f60e38b9.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 7ac3a68..a8404f0 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -678,6 +678,9 @@ QNetworkAccessManager *QDeclarativeEngine::networkAccessManager() const requests. See the QDeclarativeImageProvider documentation for details on implementing and using image providers. + All required image providers should be added to the engine before any + QML sources files are loaded. + Note that images loaded from a QDeclarativeImageProvider are cached by QPixmapCache, similar to any image loaded by QML. |