diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:11:18 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:11:18 +0100 |
| commit | abfb7b84d33726fa7b5fdff29371569018afdf8f (patch) | |
| tree | 24be73ad5e75a3b67757cc8d8ecda837a08dc3b4 /src/plugins | |
| parent | 6124b900d9507687c21e43e68f495bbee9d8d45b (diff) | |
| parent | 31338f220f1ad1d0b8c050c48b04e733c4b62e1b (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
Change-Id: I89d7e0498ff3f7818bfe8c1a3a6da3c9440ab30a
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/imageformats/imageformats.pro | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/plugins/imageformats/imageformats.pro b/src/plugins/imageformats/imageformats.pro index be1e20a..4116591 100644 --- a/src/plugins/imageformats/imageformats.pro +++ b/src/plugins/imageformats/imageformats.pro @@ -21,9 +21,3 @@ qtConfig(jasper) { } else:darwin: { SUBDIRS += macjp2 } - -winrt { - SUBDIRS -= tiff \ - tga \ - webp -} |