diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-09 03:00:28 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-09 03:00:28 +0200 |
| commit | 86872a1846ce622bb5f305a75a20939ac145122f (patch) | |
| tree | fbfc26468ed9e1780d3e6bc4605de8ae6defd97d | |
| parent | cee7701c76579ff139b42f2092306a88f0394dc5 (diff) | |
| parent | b1d12f8c874cf36d1672e9fe7203aa7d499c39c5 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta2
Change-Id: I02bc865209f0092c68e5be1542f54e605c517c58
| -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> |