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>

2 files changed, 40 insertions, 0 deletions

diff --git a/src/3rdparty/libjpeg/src/jconfig.h b/src/3rdparty/libjpeg/src/jconfig.h
new file mode 100644
index 0000000000..74a74f754c
--- /dev/null
+++ b/src/3rdparty/libjpeg/src/jconfig.h
@@ -0,0 +1,23 @@
+// Definitions for building in Qt source, ref. src/jconfig.h.in
+
+#define JPEG_LIB_VERSION 80
+
+#define LIBJPEG_TURBO_VERSION 2.0.6
+
+#define LIBJPEG_TURBO_VERSION_NUMBER 2000006
+
+#define C_ARITH_CODING_SUPPORTED 1
+
+#define D_ARITH_CODING_SUPPORTED 1
+
+#define MEM_SRCDST_SUPPORTED 1
+
+#define BITS_IN_JSAMPLE 8
+
+#define HAVE_STDDEF_H 1
+
+#define HAVE_STDLIB_H 1
+
+#define HAVE_UNSIGNED_CHAR 1
+
+#define HAVE_UNSIGNED_SHORT 1
diff --git a/src/3rdparty/libjpeg/src/jconfigint.h b/src/3rdparty/libjpeg/src/jconfigint.h
new file mode 100644
index 0000000000..40d7748e10
--- /dev/null
+++ b/src/3rdparty/libjpeg/src/jconfigint.h
@@ -0,0 +1,17 @@
+// Definitions for building in Qt source, ref. src/jconfigint.h.in
+
+#include <stdint.h>
+
+#define BUILD ""
+
+#define INLINE inline
+
+#define PACKAGE_NAME "libjpeg-turbo"
+
+#define VERSION "2.0.6"
+
+#if SIZE_MAX == 0xffffffff
+#define SIZEOF_SIZE_T 4
+#elif SIZE_MAX == 0xffffffffffffffff
+#define SIZEOF_SIZE_T 8
+#endif