diff options
| author | BogDan Vatra <bogdan@kde.org> | 2013-01-03 19:30:00 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-27 08:40:43 +0100 |
| commit | 50731469be7b7c0ed18768789604e13955a8b2f7 (patch) | |
| tree | 8c8010bdb81d4cc06e1ed2fb5b7d414dec355a1d | |
| parent | 4b1c277873bbb8dc1b594a31392f42ce34df73e1 (diff) | |
Fix compilation for Android.v5.1.0-alpha1
Change-Id: Ide46bb5104022c5e54a1f2a8bd7822a14bcf603d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| -rw-r--r-- | src/3rdparty/libtiff.pri | 1 | ||||
| -rw-r--r-- | src/3rdparty/libtiff/libtiff/tif_config.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/libtiff.pri b/src/3rdparty/libtiff.pri index 921b3e6..9e743f0 100644 --- a/src/3rdparty/libtiff.pri +++ b/src/3rdparty/libtiff.pri @@ -38,5 +38,6 @@ wince*: SOURCES += $$PWD/../corelib/kernel/qfunctions_wince.cpp \ $$PWD/libtiff/libtiff/tif_wince.c win32: SOURCES += $$PWD/libtiff/libtiff/tif_win32.c else: SOURCES += $$PWD/libtiff/libtiff/tif_unix.c +android: SOURCES += $$PWD/libtiff/port/lfind.c include($$PWD/zlib_dependency.pri) diff --git a/src/3rdparty/libtiff/libtiff/tif_config.h b/src/3rdparty/libtiff/libtiff/tif_config.h index f851384..dc579c3 100644 --- a/src/3rdparty/libtiff/libtiff/tif_config.h +++ b/src/3rdparty/libtiff/libtiff/tif_config.h @@ -110,7 +110,7 @@ /* #undef HAVE_PTHREAD */ /* Define to 1 if you have the <search.h> header file. */ -#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN) && !defined(Q_OS_VXWORKS) +#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN) && !defined(Q_OS_VXWORKS) && !defined(Q_OS_ANDROID) #define HAVE_SEARCH_H 1 #endif |