diff options
Diffstat (limited to 'src/quick/items/qquickimagebase.cpp')
-rw-r--r-- | src/quick/items/qquickimagebase.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/quick/items/qquickimagebase.cpp b/src/quick/items/qquickimagebase.cpp index a2b99b6395..22d631e917 100644 --- a/src/quick/items/qquickimagebase.cpp +++ b/src/quick/items/qquickimagebase.cpp @@ -246,7 +246,7 @@ void QQuickImageBase::load() resolve2xLocalFile(d->url, targetDevicePixelRatio, &loadUrl, &d->devicePixelRatio); } - d->pix.load(qmlEngine(this), loadUrl, d->sourcesize * d->devicePixelRatio, options, d->autoTransform); + d->pix.load(qmlEngine(this), loadUrl, d->sourcesize * d->devicePixelRatio, options, d->providerOptions); if (d->pix.isLoading()) { if (d->progress != 0.0) { @@ -281,7 +281,7 @@ void QQuickImageBase::requestFinished() Q_D(QQuickImageBase); if (d->pix.isError()) { - qmlInfo(this) << d->pix.error(); + qmlWarning(this) << d->pix.error(); d->pix.clear(this); d->status = Error; if (d->progress != 0.0) { @@ -381,17 +381,18 @@ void QQuickImageBase::resolve2xLocalFile(const QUrl &url, qreal targetDevicePixe bool QQuickImageBase::autoTransform() const { Q_D(const QQuickImageBase); - if (d->autoTransform == UsePluginDefault) - return d->pix.autoTransform() == ApplyTransform; - return d->autoTransform == ApplyTransform; + if (d->providerOptions.autoTransform() == QQuickImageProviderOptions::UsePluginDefaultTransform) + return d->pix.autoTransform() == QQuickImageProviderOptions::ApplyTransform; + return d->providerOptions.autoTransform() == QQuickImageProviderOptions::ApplyTransform; } void QQuickImageBase::setAutoTransform(bool transform) { Q_D(QQuickImageBase); - if (d->autoTransform != UsePluginDefault && transform == (d->autoTransform == ApplyTransform)) + if (d->providerOptions.autoTransform() != QQuickImageProviderOptions::UsePluginDefaultTransform && + transform == (d->providerOptions.autoTransform() == QQuickImageProviderOptions::ApplyTransform)) return; - d->autoTransform = transform ? ApplyTransform : DoNotApplyTransform; + d->providerOptions.setAutoTransform(transform ? QQuickImageProviderOptions::ApplyTransform : QQuickImageProviderOptions::DoNotApplyTransform); emitAutoTransformBaseChanged(); } |