diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-03-01 11:24:27 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-03-01 11:24:27 (GMT) |
| commit | 4cc9d165663728cb08b3269ea88a584410b79b70 (patch) | |
| tree | d1e1993be1d929a00478be0629d9fec910dd86ca /src/plugins/imageformats/tiff/tiff.pro | |
| parent | 3a4dc08d08ce0388dd183a24923871e3e03ba531 (diff) | |
| parent | 049330b4a54836f227a0e179082527a5272e868d (diff) | |
| download | Qt-4cc9d165663728cb08b3269ea88a584410b79b70.zip Qt-4cc9d165663728cb08b3269ea88a584410b79b70.tar.gz Qt-4cc9d165663728cb08b3269ea88a584410b79b70.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'src/plugins/imageformats/tiff/tiff.pro')
| -rw-r--r-- | src/plugins/imageformats/tiff/tiff.pro | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro index 312f99c..514fd69 100644 --- a/src/plugins/imageformats/tiff/tiff.pro +++ b/src/plugins/imageformats/tiff/tiff.pro @@ -47,14 +47,15 @@ contains(QT_CONFIG, system-tiff) { ../../../3rdparty/libtiff/libtiff/tif_warning.c \ ../../../3rdparty/libtiff/libtiff/tif_write.c \ ../../../3rdparty/libtiff/libtiff/tif_zip.c - win32 { + win32:!wince*: { SOURCES += ../../../3rdparty/libtiff/libtiff/tif_win32.c } unix: { SOURCES += ../../../3rdparty/libtiff/libtiff/tif_unix.c } wince*: { - SOURCES += ../../../corelib/kernel/qfunctions_wince.cpp + SOURCES += ../../../corelib/kernel/qfunctions_wince.cpp \ + ../../../3rdparty/libtiff/libtiff/tif_wince.c } symbian*: { SOURCES += ../../../3rdparty/libtiff/port/lfind.c |