diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-03-26 12:21:52 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-04-02 14:13:21 +0000 |
| commit | b1d12f8c874cf36d1672e9fe7203aa7d499c39c5 (patch) | |
| tree | a7006ca5a87d3cba1619575d5d5f183dbc47b634 | |
| parent | a33e3aeac74c8fc8d1fff7a244083d96f9bba70f (diff) | |
Remove the QT_NO_IMAGEFORMAT_{TIFF|WEBP} defines
They are #undef'ed anyway.
Change-Id: Ic1cb3c09b5849f16115d8514fef471825d564f2c
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| -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> |