Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: I02bc865209f0092c68e5be1542f54e605c517c58

Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I02bc865209f0092c68e5be1542f54e605c517c58
86872a18 · Qt Forward Merge Bot · cee7701c · b1d12f8c · 86872a18 · 86872a18
Commit 86872a18 authored 6 years ago by Qt Forward Merge Bot
--- 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": {

--- 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

--- 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>