From 5df88b85c6e61409c5c759e78f32edaac7b2022f Mon Sep 17 00:00:00 2001 From: Eirik Aavitsland Date: Fri, 30 Apr 2021 10:39:12 +0200 Subject: 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. Pick-to: 6.1 6.0 5.15 5.12 Change-Id: I5b574446bbd264b0a1cb3efceb4c1cb7203cac7d Reviewed-by: Allan Sandfeld Jensen --- src/plugins/imageformats/jpeg/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'src/plugins/imageformats/jpeg') diff --git a/src/plugins/imageformats/jpeg/CMakeLists.txt b/src/plugins/imageformats/jpeg/CMakeLists.txt index fbcb10600a..f0f910d9fd 100644 --- a/src/plugins/imageformats/jpeg/CMakeLists.txt +++ b/src/plugins/imageformats/jpeg/CMakeLists.txt @@ -90,7 +90,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 ) -- cgit v1.2.3