From ea84cd090c76e03e1cd6050c4ddf1c29c7f5ab93 Mon Sep 17 00:00:00 2001 From: Eirik Aavitsland Date: Fri, 30 Apr 2021 10:39:12 +0200 Subject: [PATCH] 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 (cherry picked from commit 5df88b85c6e61409c5c759e78f32edaac7b2022f) Reviewed-by: Qt Cherry-pick Bot --- src/3rdparty/libjpeg/import_from_libjpeg_tarball.sh | 2 +- src/3rdparty/libjpeg/{ => src}/jconfig.h | 0 src/3rdparty/libjpeg/{ => src}/jconfigint.h | 0 src/plugins/imageformats/jpeg/CMakeLists.txt | 1 - 4 files changed, 1 insertion(+), 2 deletions(-) rename src/3rdparty/libjpeg/{ => src}/jconfig.h (100%) rename src/3rdparty/libjpeg/{ => src}/jconfigint.h (100%) diff --git a/src/3rdparty/libjpeg/import_from_libjpeg_tarball.sh b/src/3rdparty/libjpeg/import_from_libjpeg_tarball.sh index 9b7e1fff826..2153eca35ab 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 similarity index 100% rename from src/3rdparty/libjpeg/jconfig.h rename to src/3rdparty/libjpeg/src/jconfig.h diff --git a/src/3rdparty/libjpeg/jconfigint.h b/src/3rdparty/libjpeg/src/jconfigint.h similarity index 100% rename from src/3rdparty/libjpeg/jconfigint.h rename to src/3rdparty/libjpeg/src/jconfigint.h diff --git a/src/plugins/imageformats/jpeg/CMakeLists.txt b/src/plugins/imageformats/jpeg/CMakeLists.txt index 7e69e1aba65..660b8149e8a 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 )