diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2019-06-20 09:44:20 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2019-07-16 22:36:27 -0300 |
| commit | d80bd2f54876c2e4c0593d3d5d4d0e01824dc301 (patch) | |
| tree | 9c64a81ad443104b5943d3c2c7ac8f709bbd7a2e /src/corelib/kernel/qtranslator.cpp | |
| parent | a5da01c0449c4237280021a11271cd433707a523 (diff) | |
QResource: deprecate isCompressed()
Current codebases assume isCompressed() implies ZlibCompression, since
there was no compressionAlgorithm() getter. In order to force codebases
to change, deprecate isCompressed() and force handling of the algorithm.
The replacement API is being introduced in 5.14, which is why the
warning is being emitted in 5.15 only.
Change-Id: Ief874765cd7b43798de3fffd15a9f5d978951ea5
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/kernel/qtranslator.cpp')
| -rw-r--r-- | src/corelib/kernel/qtranslator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp index 637ef84d21..ddb96ecad6 100644 --- a/src/corelib/kernel/qtranslator.cpp +++ b/src/corelib/kernel/qtranslator.cpp @@ -528,7 +528,8 @@ bool QTranslatorPrivate::do_load(const QString &realname, const QString &directo // memory, so no need to use QFile to copy it again. Q_ASSERT(!d->resource); d->resource = new QResource(realname); - if (resource->isValid() && !resource->isCompressed() && resource->size() >= MagicLength + if (resource->isValid() && resource->compressionAlgorithm() == QResource::NoCompression + && resource->size() >= MagicLength && !memcmp(resource->data(), magic, MagicLength)) { d->unmapLength = resource->size(); d->unmapPointer = reinterpret_cast<char *>(const_cast<uchar *>(resource->data())); |