summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-08-09 15:27:05 +0200
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-08-09 15:27:05 +0200
commite5698cc60b751f343a9fe979ceeaec912f5b91f8 (patch)
tree4a1d5fa7880f06f2bf4f4df08d6b0abe83e8c4e0
parent6d90d7c02450efd70ee36bc2bb8e1ed121d0c9bb (diff)
parent6eb10a72b773cc474c067b764efb350920427fcf (diff)
downloadqtimageformats-e5698cc60b751f343a9fe979ceeaec912f5b91f8.tar.gz
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: Ief86005c1309fdd08f32513782ee75f7e9751bc1
-rw-r--r--src/plugins/imageformats/imageformats.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/imageformats/imageformats.pro b/src/plugins/imageformats/imageformats.pro
index b6e79d4..3114367 100644
--- a/src/plugins/imageformats/imageformats.pro
+++ b/src/plugins/imageformats/imageformats.pro
@@ -16,4 +16,4 @@ winrt {
tga
}
-winrt|ios: SUBDIRS -= webp
+winrt: SUBDIRS -= webp