diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-13 03:00:46 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-13 03:00:46 +0200 |
commit | 155410fd6369ceafccb865a9d0fe2169c63a7368 (patch) | |
tree | bf4fc1fc76695125eb7358e508d4ab9cf28b4da4 | |
parent | 92cdd9fbcf48a96f88e46ae6a616278787ebd598 (diff) | |
parent | 86872a1846ce622bb5f305a75a20939ac145122f (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I8b54bca8b681654369a4b77e3d52204f94c0932d
-rw-r--r-- | src/imageformats/configure.json | 6 | ||||
-rw-r--r-- | src/plugins/imageformats/tiff/main.cpp | 3 | ||||
-rw-r--r-- | src/plugins/imageformats/webp/main.cpp | 3 |
3 files changed, 2 insertions, 10 deletions
diff --git a/src/imageformats/configure.json b/src/imageformats/configure.json index 7c60f86..2e3b101 100644 --- a/src/imageformats/configure.json +++ b/src/imageformats/configure.json @@ -169,8 +169,7 @@ "disable": "input.tiff == 'no'", "condition": "features.imageformatplugin", "output": [ - "privateFeature", - { "type": "define", "negative": true, "name": "QT_NO_IMAGEFORMAT_TIFF" } + "privateFeature" ] }, "system-tiff": { @@ -185,8 +184,7 @@ "disable": "input.webp == 'no'", "condition": "features.imageformatplugin", "output": [ - "privateFeature", - { "type": "define", "negative": true, "name": "QT_NO_IMAGEFORMAT_WEBP" } + "privateFeature" ] }, "system-webp": { diff --git a/src/plugins/imageformats/tiff/main.cpp b/src/plugins/imageformats/tiff/main.cpp index 915f47e..2c34097 100644 --- a/src/plugins/imageformats/tiff/main.cpp +++ b/src/plugins/imageformats/tiff/main.cpp @@ -42,9 +42,6 @@ #ifndef QT_NO_IMAGEFORMATPLUGIN -#ifdef QT_NO_IMAGEFORMAT_TIFF -#undef QT_NO_IMAGEFORMAT_TIFF -#endif #include "qtiffhandler_p.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/imageformats/webp/main.cpp b/src/plugins/imageformats/webp/main.cpp index 064f3ab..7e9405b 100644 --- a/src/plugins/imageformats/webp/main.cpp +++ b/src/plugins/imageformats/webp/main.cpp @@ -42,9 +42,6 @@ #ifndef QT_NO_IMAGEFORMATPLUGIN -#ifdef QT_NO_IMAGEFORMAT_WEBP -#undef QT_NO_IMAGEFORMAT_WEBP -#endif #include "qwebphandler_p.h" #include <qiodevice.h> |