diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2020-05-26 09:14:15 -0700 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-06-30 20:32:38 +0000 |
| commit | 0e4296b24cffa8e0eada1adcd6099f19cd0bca85 (patch) | |
| tree | 895acc85da736854afbece1a467eeda2d3371228 /src/corelib/mimetypes/qmimeprovider.cpp | |
| parent | 8a4cac976044e925d938a9106bd299b7627ede20 (diff) | |
QMimeDatabase/zlib: fix build with z_const macro empty
The next_in pointer in z_stream is defined as "z_const Bytef *" but
z_const is actually an empty macro in most builds. Since our data is
read-only constexpr, we need this const_cast to compile.
Fixes: QTBUG-84457
Change-Id: Ied637aece2a7427b8a2dfffd1612a01ae46f7c1a
Reviewed-by: David Faure <david.faure@kdab.com>
(cherry picked from commit cdcb75c46b968dbfeb1992c6bee19aceda27da38)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/corelib/mimetypes/qmimeprovider.cpp')
| -rw-r--r-- | src/corelib/mimetypes/qmimeprovider.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/mimetypes/qmimeprovider.cpp b/src/corelib/mimetypes/qmimeprovider.cpp index b9bc4e76bf..a28c43a4ad 100644 --- a/src/corelib/mimetypes/qmimeprovider.cpp +++ b/src/corelib/mimetypes/qmimeprovider.cpp @@ -646,7 +646,7 @@ QMimeXMLProvider::QMimeXMLProvider(QMimeDatabasePrivate *db, InternalDatabaseEnu #elif defined(MIME_DATABASE_IS_GZIP) std::unique_ptr<char []> uncompressed(new char[size]); z_stream zs = {}; - zs.next_in = mimetype_database; + zs.next_in = const_cast<Bytef *>(mimetype_database); zs.avail_in = sizeof(mimetype_database); zs.next_out = reinterpret_cast<Bytef *>(uncompressed.get()); zs.avail_out = size; |