diff options
| author | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2021-04-30 10:39:12 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-05-05 17:37:06 +0000 |
| commit | ea84cd090c76e03e1cd6050c4ddf1c29c7f5ab93 (patch) | |
| tree | 951a3645c816bcfbc6129aa1f1aa52dd9482fe01 | |
| parent | 0eaf920983ea9006f3fe26d1bdf104e63984d689 (diff) | |
Simplify bundled libjpeg build
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>
| -rwxr-xr-x | src/3rdparty/libjpeg/import_from_libjpeg_tarball.sh | 2 | ||||
| -rw-r--r-- | src/3rdparty/libjpeg/src/jconfig.h (renamed from src/3rdparty/libjpeg/jconfig.h) | 0 | ||||
| -rw-r--r-- | src/3rdparty/libjpeg/src/jconfigint.h (renamed from src/3rdparty/libjpeg/jconfigint.h) | 0 | ||||
| -rw-r--r-- | src/plugins/imageformats/jpeg/CMakeLists.txt | 1 |
4 files changed, 1 insertions, 2 deletions
diff --git a/src/3rdparty/libjpeg/import_from_libjpeg_tarball.sh b/src/3rdparty/libjpeg/import_from_libjpeg_tarball.sh index 9b7e1fff82..2153eca35a 100755 --- a/src/3rdparty/libjpeg/import_from_libjpeg_tarball.sh +++ b/src/3rdparty/libjpeg/import_from_libjpeg_tarball.sh @@ -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. diff --git a/src/3rdparty/libjpeg/jconfig.h b/src/3rdparty/libjpeg/src/jconfig.h index 74a74f754c..74a74f754c 100644 --- a/src/3rdparty/libjpeg/jconfig.h +++ b/src/3rdparty/libjpeg/src/jconfig.h diff --git a/src/3rdparty/libjpeg/jconfigint.h b/src/3rdparty/libjpeg/src/jconfigint.h index 40d7748e10..40d7748e10 100644 --- a/src/3rdparty/libjpeg/jconfigint.h +++ b/src/3rdparty/libjpeg/src/jconfigint.h diff --git a/src/plugins/imageformats/jpeg/CMakeLists.txt b/src/plugins/imageformats/jpeg/CMakeLists.txt index 7e69e1aba6..660b8149e8 100644 --- a/src/plugins/imageformats/jpeg/CMakeLists.txt +++ b/src/plugins/imageformats/jpeg/CMakeLists.txt @@ -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 ) |