diff options
| author | Robin Burchell <robin.burchell@viroteck.net> | 2016-02-09 16:26:07 +0100 |
|---|---|---|
| committer | Robin Burchell <robin.burchell@viroteck.net> | 2016-02-12 20:23:05 +0000 |
| commit | 2a36495cde3f60b3782c277490638e274216a869 (patch) | |
| tree | cc3f1b89176eef3ae00634ccbe6d3fe9744a162b /src | |
| parent | 084dbb06d7b00c4a67edb6ce58956150036c35f2 (diff) | |
QQuickPixmapCache: Use readImage's (more useful) error message.
readImage already assigns to errorString if something goes wrong, so there's no
need to overwrite it with a less useful error message (which doesn't tell us
what actually went wrong).
Before: Invalid image data: test.qml
After: Error decoding: test.qml: Unsupported image format
Change-Id: I7df3d24497d001e18453034c6f9f63bb51bd0ecc
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Reviewed-by: Michael Brasser <michael.brasser@live.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quick/util/qquickpixmapcache.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/quick/util/qquickpixmapcache.cpp b/src/quick/util/qquickpixmapcache.cpp index ed6da8ac91..36374e628e 100644 --- a/src/quick/util/qquickpixmapcache.cpp +++ b/src/quick/util/qquickpixmapcache.cpp @@ -1185,8 +1185,6 @@ static QQuickPixmapData* createPixmapDataSync(QQuickPixmap *declarativePixmap, Q *ok = true; return new QQuickPixmapData(declarativePixmap, url, QQuickTextureFactory::textureFactoryForImage(image), readSize, requestSize, autoTransform, appliedTransform); } - errorString = QQuickPixmap::tr("Invalid image data: %1").arg(url.toString()); - } else { errorString = QQuickPixmap::tr("Cannot open: %1").arg(url.toString()); } |