diff options
| author |   Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-04 21:21:43 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-04 21:21:43 +0200 |
| commit | 4e158f6bfa7d0747d8da70b3b15a44b52e35bb8a (patch) | |
| tree | 84e20982138de5c9b6d319bf83ac79bd672f918f /src/3rdparty/libjpeg/src/jdmainct.c | |
| parent | Update the LGPL license header (diff) | |
| parent | QVarLengthArray: fix UBs in emplace()/insert() ([basic.life], broken class invariant) (diff) | |
| download | qtbase-4e158f6bfa7d0747d8da70b3b15a44b52e35bb8a.tar.xz qtbase-4e158f6bfa7d0747d8da70b3b15a44b52e35bb8a.zip | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.13' into tqtc/lts-5.15-opensourcev5.15.13-lts-lgpl
Change-Id: Ie9df84af22570d601db002e391a1a0d97e7cd9e1
Diffstat (limited to 'src/3rdparty/libjpeg/src/jdmainct.c')
| -rw-r--r-- | src/3rdparty/libjpeg/src/jdmainct.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/3rdparty/libjpeg/src/jdmainct.c b/src/3rdparty/libjpeg/src/jdmainct.c index f466b259f0..d332e6b2fa 100644 --- a/src/3rdparty/libjpeg/src/jdmainct.c +++ b/src/3rdparty/libjpeg/src/jdmainct.c @@ -18,7 +18,6 @@ #include "jinclude.h" #include "jdmainct.h" -#include "jconfigint.h" /* |