diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-01-25 14:30:30 +0100 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-01-25 14:31:06 +0100 |
commit | 00d3f3e9da071efce92d320884b331ea559fb292 (patch) | |
tree | 0649bd5c1be5a8ca01617655ac54c6373322f14a /src/quick/util | |
parent | 5c2ba6db53b2190160081695faff521bc367e33d (diff) | |
parent | b07a6cf8c5788b7e4ca722c9aa8c06e76e688c5d (diff) |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: I7b6437740077a4e2c9b2c36ee1cd4eb472f1f49f
Diffstat (limited to 'src/quick/util')
-rw-r--r-- | src/quick/util/qquickimageprovider.cpp | 2 | ||||
-rw-r--r-- | src/quick/util/qquickpixmapcache.cpp | 9 | ||||
-rw-r--r-- | src/quick/util/qquickpixmapcache_p.h | 4 |
3 files changed, 3 insertions, 12 deletions
diff --git a/src/quick/util/qquickimageprovider.cpp b/src/quick/util/qquickimageprovider.cpp index c4182d9f93..7788635e3e 100644 --- a/src/quick/util/qquickimageprovider.cpp +++ b/src/quick/util/qquickimageprovider.cpp @@ -514,9 +514,9 @@ public: /*! \class QQuickImageProviderOptions - \since 5.9 \brief The QQuickImageProviderOptions class provides options for QQuickImageProviderWithOptions image requests. \inmodule QtQuick + \internal \sa QQuickImageProviderWithOptions */ diff --git a/src/quick/util/qquickpixmapcache.cpp b/src/quick/util/qquickpixmapcache.cpp index 7b369a2d0f..1c6b2afb54 100644 --- a/src/quick/util/qquickpixmapcache.cpp +++ b/src/quick/util/qquickpixmapcache.cpp @@ -695,15 +695,6 @@ void QQuickPixmapReader::processJob(QQuickPixmapReply *runningJob, const QUrl &u QQuickImageProviderWithOptions *providerV2 = provider->d->isProviderWithOptions ? static_cast<QQuickImageProviderWithOptions *>(provider) : nullptr; - if (!provider->d->isProviderWithOptions && - (providerOptions.autoTransform() != QQuickImageProviderOptions::UsePluginDefaultTransform - || providerOptions.preserveAspectRatioCrop() - || providerOptions.preserveAspectRatioFit()) - ) - { - qWarning() << "Trying to pass extra request flags to provider but it is not a QQuickImageProviderWithOptions"; - } - switch (imageType) { case QQuickImageProvider::Invalid: { diff --git a/src/quick/util/qquickpixmapcache_p.h b/src/quick/util/qquickpixmapcache_p.h index eea6a7a454..f7cdfa7d07 100644 --- a/src/quick/util/qquickpixmapcache_p.h +++ b/src/quick/util/qquickpixmapcache_p.h @@ -91,7 +91,7 @@ public: }; // ### Qt 6: Make public moving to qquickimageprovider.h -class Q_QUICK_EXPORT QQuickImageProviderOptions +class Q_QUICK_PRIVATE_EXPORT QQuickImageProviderOptions { public: enum AutoTransform { @@ -188,7 +188,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickPixmap::Options) // This class will disappear with Qt6 and will just be the regular QQuickImageProvider // ### Qt 6: Remove this class and fold it with QQuickImageProvider -class Q_QUICK_EXPORT QQuickImageProviderWithOptions : public QQuickAsyncImageProvider +class Q_QUICK_PRIVATE_EXPORT QQuickImageProviderWithOptions : public QQuickAsyncImageProvider { public: QQuickImageProviderWithOptions(ImageType type, Flags flags = Flags()); |