diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-04-15 13:35:14 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-04-16 16:49:29 +0200 |
| commit | f641a0dbcfd52e78e068357d9c66236798e043e8 (patch) | |
| tree | 1178a3f6e7f1b43bc673a6f82faa323a24d2ca1f | |
| parent | 6ed83f82fe48d9ea9ab6c2a984f4bb6d51acf6a7 (diff) | |
Fix build of jpeg plugin against recent jpeg-turbo on MinGW
Remove the MinGW-related hack that was introduced in
ec31953007126a6e0f9f3ca16b64bdfdcdf3d7b6. 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>
| -rw-r--r-- | src/plugins/imageformats/jpeg/qjpeghandler.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/plugins/imageformats/jpeg/qjpeghandler.cpp b/src/plugins/imageformats/jpeg/qjpeghandler.cpp index beef18f260..a17afc0f69 100644 --- a/src/plugins/imageformats/jpeg/qjpeghandler.cpp +++ b/src/plugins/imageformats/jpeg/qjpeghandler.cpp @@ -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 |