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)
This commit is contained in:
parent
d55a3eb57e
commit
19fedbafb5
1
src/3rdparty/libjpeg.pri
vendored
1
src/3rdparty/libjpeg.pri
vendored
@ -5,7 +5,6 @@ gcc: QMAKE_CFLAGS_WARN_ON += -Wno-unused-parameter -Wno-main
|
||||
|
||||
|
||||
INCLUDEPATH += \
|
||||
$$PWD/libjpeg \
|
||||
$$PWD/libjpeg/src
|
||||
|
||||
SOURCES += \
|
||||
|
@ -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.
|
||||
|
Loading…
x
Reference in New Issue
Block a user