diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-24 19:36:15 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-24 19:47:55 +0100 |
| commit | 018828170d807f6647a843e61c82733c3f601d14 (patch) | |
| tree | d666670c8a60f7ffb7e2446ca2818bbd07bacc97 /src/plugins/imageformats/imageformats.pro | |
| parent | 11300c62aa021ef07f3e4de8bd875bfcbcbe2f7e (diff) | |
| parent | 16362da5762b2375ac986d19266cef0bcdc5047c (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.75.7
Conflicts:
src/plugins/imageformats/webp/qwebphandler.cpp
Change-Id: I494e140819746c83e586bea72d8b02a7d245d970
Diffstat (limited to 'src/plugins/imageformats/imageformats.pro')
| -rw-r--r-- | src/plugins/imageformats/imageformats.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/imageformats/imageformats.pro b/src/plugins/imageformats/imageformats.pro index 08f5151..23ada9a 100644 --- a/src/plugins/imageformats/imageformats.pro +++ b/src/plugins/imageformats/imageformats.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs SUBDIRS = \ - dds \ +# dds \ icns \ tga \ tiff \ |