diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-04 19:46:58 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-04 19:46:58 +0200 |
| commit | 3651d51982b2421c21ae80767057586cb823e2c2 (patch) | |
| tree | 845ef00ad40d8f5472ded51bbbc2d409aeb57513 /src/3rdparty | |
| parent | e77e64aff2134dd2f8884068fcf13a965b7c7b3f (diff) | |
| parent | 2e0e26d00d55ad2b16a5fa7441314acc2c407124 (diff) | |
| download | qtimageformats-3651d51982b2421c21ae80767057586cb823e2c2.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
sync.profile
Change-Id: I8f788167e37c9b9ca3f4a59a9785a435eeaa6317
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/libtiff.pri | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/3rdparty/libtiff.pri b/src/3rdparty/libtiff.pri index 9e743f0..3479d85 100644 --- a/src/3rdparty/libtiff.pri +++ b/src/3rdparty/libtiff.pri @@ -34,8 +34,7 @@ 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_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 |