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-06 07:01:18 +0000 |
| commit | f3179ec8049746de61fbe275ea600e46a93abfb9 (patch) | |
| tree | 9c284c2c2937699397d8eec18d676d4fbffb6481 /src/plugins | |
| parent | 61f56d9bb73ea6a273f90fe83f6013b4a698048e (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>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/imageformats/jpeg/CMakeLists.txt | 1 |
1 files changed, 0 insertions, 1 deletions
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 ) |