From 19fedbafb5efaf27765bc25677ee9295ec08dc06 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) --- src/3rdparty/libjpeg.pri | 1 - src/3rdparty/libjpeg/import_from_libjpeg_tarball.sh | 2 +- src/3rdparty/libjpeg/{ => src}/jconfig.h | 0 src/3rdparty/libjpeg/{ => src}/jconfigint.h | 0 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.pri b/src/3rdparty/libjpeg.pri index 5effbe9d26c..6ef40697946 100644 --- a/src/3rdparty/libjpeg.pri +++ b/src/3rdparty/libjpeg.pri @@ -5,7 +5,6 @@ gcc: QMAKE_CFLAGS_WARN_ON += -Wno-unused-parameter -Wno-main INCLUDEPATH += \ - $$PWD/libjpeg \ $$PWD/libjpeg/src SOURCES += \ 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