From b1d12f8c874cf36d1672e9fe7203aa7d499c39c5 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Tue, 26 Mar 2019 12:21:52 +0100
Subject: [PATCH] Remove the QT_NO_IMAGEFORMAT_{TIFF|WEBP} defines
They are #undef'ed anyway.
Change-Id: Ic1cb3c09b5849f16115d8514fef471825d564f2c
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
---
src/imageformats/configure.json | 6 ++----
src/plugins/imageformats/tiff/main.cpp | 3 ---
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 7c60f868..2e3b1013 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 915f47e8..2c34097e 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 064f3abf..7e9405b0 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>
--
GitLab