1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify bundled libjpeg build

Browse Source 
Move the config headers of the bundled libjpeg back into its source
directory, where they originally live, to avoid having to trick with
the include path to find them.
The goal is unification across maintained Qt branches, making version
updates simpler.

Change-Id: I5b574446bbd264b0a1cb3efceb4c1cb7203cac7d
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 5df88b85c6e61409c5c759e78f32edaac7b2022f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Eirik Aavitsland 2021-04-30 10:39:12 +02:00 committed by Qt Cherry-pick Bot
parent 0eaf920983
commit ea84cd090c
4 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/3rdparty/libjpeg/import_from_libjpeg_tarball.sh vendored
View File

@ -165,4 +165,4 @@ for i in $FILES; do
copy_file "$i" "src/$i"
done
echo Done. $TARGET_DIR/jconfig.h and jconfigint.h may need manual updating.
echo Done. $TARGET_DIR/src/jconfig.h and jconfigint.h may need manual updating.

0
src/3rdparty/libjpeg/jconfig.h → src/3rdparty/libjpeg/src/jconfig.h vendored
View File

0
src/3rdparty/libjpeg/jconfigint.h → src/3rdparty/libjpeg/src/jconfigint.h vendored
View File

1
src/plugins/imageformats/jpeg/CMakeLists.txt
View File

@ -83,7 +83,6 @@ qt_internal_extend_target(QJpegPlugin CONDITION NOT QT_FEATURE_system_jpeg
../../../3rdparty/libjpeg/src/jsimd_none.c
../../../3rdparty/libjpeg/src/jutils.c
INCLUDE_DIRECTORIES
../../../3rdparty/libjpeg
../../../3rdparty/libjpeg/src
)