summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2010-07-08 05:33:37 (GMT)
committerBea Lam <bea.lam@nokia.com>2010-07-08 05:35:49 (GMT)
commita2ee0cfd799f563f292e6b40ca460e05819fd0fd (patch)
tree6e5ea43a576bf3e3fae5ac5ee4d9b08942ecdd80 /src/declarative
parent33b664eabe5d9621d71e5bf3bfcc46ea385a399c (diff)
downloadQt-a2ee0cfd799f563f292e6b40ca460e05819fd0fd.zip
Qt-a2ee0cfd799f563f292e6b40ca460e05819fd0fd.tar.gz
Qt-a2ee0cfd799f563f292e6b40ca460e05819fd0fd.tar.bz2
Don't show warning for attempts to load pixmaps asynchronously
(should be handled by image providers, elements shouldn't have to know about the capabilities)
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/util/qdeclarativepixmapcache.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativepixmapcache.cpp b/src/declarative/util/qdeclarativepixmapcache.cpp
index f729ced..00dd922 100644
--- a/src/declarative/util/qdeclarativepixmapcache.cpp
+++ b/src/declarative/util/qdeclarativepixmapcache.cpp
@@ -952,10 +952,9 @@ void QDeclarativePixmap::load(QDeclarativeEngine *engine, const QUrl &url, const
if (iter == store->m_cache.end()) {
if (async) {
+ // pixmaps can only be loaded synchronously
if (url.scheme() == QLatin1String("image")
&& QDeclarativeEnginePrivate::get(engine)->getImageProviderType(url) == QDeclarativeImageProvider::Pixmap) {
- qWarning().nospace() << "Pixmaps must be loaded synchronously, ignoring asynchronous property for Image with source: "
- << url.toString();
async = false;
}
}