diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-27 00:54:17 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-27 00:54:17 (GMT) |
| commit | 055fe95fedfe37df8a44291ac362afec9779dd95 (patch) | |
| tree | ac48d4b0bc8f8290765e8d17513f3fc9f4b38ae5 /src/plugins | |
| parent | ca82ee4ee55e52c75326949148455af1095df014 (diff) | |
| parent | d04107dd30c4af09eb879113f2a48839f8938bcf (diff) | |
| download | Qt-055fe95fedfe37df8a44291ac362afec9779dd95.zip Qt-055fe95fedfe37df8a44291ac362afec9779dd95.tar.gz Qt-055fe95fedfe37df8a44291ac362afec9779dd95.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 |