whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build of jpeg plugin against recent jpeg-turbo on MinGW 

Remove the MinGW-related hack that was introduced in
ec31953007. It doesn't seem to be needed
anymore with recent MinGW versions and prevents using a system jpeglib
that disagrees in its jboolean declaration with our bundled jpeglib.

Fixes: QTBUG-88093
Change-Id: Ic6eb03b4b395fe3e8dcedf52489e8642289fc98e
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
bb10
Joerg Bornemann 2021-04-15 13:35:14 +02:00
parent 6ed83f82fe
commit f641a0dbcf
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/imageformats/jpeg/qjpeghandler.cpp
View File

@ -61,13 +61,6 @@
// including jpeglib.h seems to be a little messy
extern "C" {
// jpeglib.h->jmorecfg.h tries to typedef int boolean; but this conflicts with
// some Windows headers that may or may not have been included
#ifdef HAVE_BOOLEAN
# undef HAVE_BOOLEAN
#endif
#define boolean jboolean
#define XMD_H // shut JPEGlib up
#include <jpeglib.h>
#ifdef const