diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-27 08:11:41 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-27 08:11:41 (GMT) |
| commit | 6396e7a15079cb157caef319348a0bcd0b95a6a7 (patch) | |
| tree | fed9a151ac0d04258be8cc0c382ffde299868ae4 /src/plugins | |
| parent | 31450ba3b0d83dba4e171ae966295b173ac1fb0f (diff) | |
| parent | 055fe95fedfe37df8a44291ac362afec9779dd95 (diff) | |
| download | Qt-6396e7a15079cb157caef319348a0bcd0b95a6a7.zip Qt-6396e7a15079cb157caef319348a0bcd0b95a6a7.tar.gz Qt-6396e7a15079cb157caef319348a0bcd0b95a6a7.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QMainWindow would show hidden QDockwidget when calling rstoreDockWidget
Compile on WinCE
Diffstat (limited to 'src/plugins')
| -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 |