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/plugins/imageformats/tiff/tiff.pro | |
parent | e77e64aff2134dd2f8884068fcf13a965b7c7b3f (diff) | |
parent | 2e0e26d00d55ad2b16a5fa7441314acc2c407124 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
sync.profile
Change-Id: I8f788167e37c9b9ca3f4a59a9785a435eeaa6317
Diffstat (limited to 'src/plugins/imageformats/tiff/tiff.pro')
-rw-r--r-- | src/plugins/imageformats/tiff/tiff.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro index 66eea8c..353e3f3 100644 --- a/src/plugins/imageformats/tiff/tiff.pro +++ b/src/plugins/imageformats/tiff/tiff.pro @@ -6,6 +6,7 @@ load(qt_plugin) HEADERS += qtiffhandler_p.h SOURCES += main.cpp qtiffhandler.cpp +wince*: SOURCES += qfunctions_wince.cpp OTHER_FILES += tiff.json config_libtiff { |