diff options
| author | Eirik Aavitsland <eirik.aavitsland@theqtcompany.com> | 2015-04-09 16:06:37 +0200 |
|---|---|---|
| committer | aavit <eirik.aavitsland@theqtcompany.com> | 2015-04-12 21:07:07 +0000 |
| commit | a16695f45f8de7608584937d5b4df34613eb0685 (patch) | |
| tree | dcd8454ded44057f9e2fdcd7cde010231e1316a6 /src/3rdparty/libtiff.pri | |
| parent | 35c968f8582783884936d9e8e8421d75c369b172 (diff) | |
Update bundled libtiff to version 4.0.3
This updates libtiff.pri and 3rdparty/libtiff to the current state in
the Qt 5 qtimageformats module, commit
c3035a1655090b0f6b194fb8a7586c013ef24f6a. The patch history relative
to upstream 4.0.3 is available in that module.
Change-Id: I70d278081c62ba179c5f9658a0d59313c77ba415
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/3rdparty/libtiff.pri')
| -rw-r--r-- | src/3rdparty/libtiff.pri | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/3rdparty/libtiff.pri b/src/3rdparty/libtiff.pri index e43e1feca2..bc97ee9698 100644 --- a/src/3rdparty/libtiff.pri +++ b/src/3rdparty/libtiff.pri @@ -34,10 +34,9 @@ SOURCES += \ $$PWD/libtiff/libtiff/tif_write.c \ $$PWD/libtiff/libtiff/tif_zip.c -wince*: SOURCES += $$PWD/../corelib/kernel/qfunctions_wince.cpp \ - $$PWD/libtiff/libtiff/tif_wince.c +wince*: SOURCES += $$PWD/libtiff/libtiff/tif_win32.c win32: SOURCES += $$PWD/libtiff/libtiff/tif_win32.c else: SOURCES += $$PWD/libtiff/libtiff/tif_unix.c -symbian: SOURCES += $$PWD/libtiff/port/lfind.c +android: SOURCES += $$PWD/libtiff/port/lfind.c include($$PWD/zlib_dependency.pri) |