diff options
| author | André Klitzing <aklitzing@gmail.com> | 2017-07-28 18:38:55 +0200 |
|---|---|---|
| committer | André Klitzing <aklitzing@gmail.com> | 2017-09-28 10:06:26 +0000 |
| commit | 9c13ec5fa392930e9a1880ad20c11ba47fdc54ba (patch) | |
| tree | 71355136ba851d004e7f902d13077fdc9388f607 /src/3rdparty/libjpeg/jversion.h | |
| parent | 0731c092d107415cc300be2209cd2bfb417950e9 (diff) | |
Replace bundled libjpeg by libjpeg-turbo 1.5.2
Most linux distribution uses libjpeg-turbo as a replacement for libjpeg.
Since Qt will be linked against -turbo more frequently than the "original"
libjpeg we should use it for the bundled copy, too.
Also add an import script.
[ChangeLog][Third-Party Code] Replaced bundled libjpeg by libjpeg-turbo 1.5.2
Change-Id: I41081db74f194cbc288820fc783c9fef16545efd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'src/3rdparty/libjpeg/jversion.h')
| -rw-r--r-- | src/3rdparty/libjpeg/jversion.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/3rdparty/libjpeg/jversion.h b/src/3rdparty/libjpeg/jversion.h deleted file mode 100644 index e868538c88..0000000000 --- a/src/3rdparty/libjpeg/jversion.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * jversion.h - * - * Copyright (C) 1991-2011, Thomas G. Lane, Guido Vollbeding. - * This file is part of the Independent JPEG Group's software. - * For conditions of distribution and use, see the accompanying README file. - * - * This file contains software version identification. - */ - - -#define JVERSION "8c 16-Jan-2011" - -#define JCOPYRIGHT "Copyright (C) 2011, Thomas G. Lane, Guido Vollbeding" |