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

Change-Id: Idd134e350e760a0237dce4ef00d10e1c35dbeb67

3 files changed, 18 insertions, 10 deletions

diff --git a/src/plugins/imageformats/imageformats.pro b/src/plugins/imageformats/imageformats.pro
index d6c59ee..be1e20a 100644
--- a/src/plugins/imageformats/imageformats.pro
+++ b/src/plugins/imageformats/imageformats.pro
@@ -2,17 +2,21 @@ TEMPLATE = subdirs
 SUBDIRS = \
 #    dds \
     tga \
-    tiff \
-    wbmp \
-    webp
+    wbmp
+
+include($$OUT_PWD/../../imageformats/qtimageformats-config.pri)
+QT_FOR_CONFIG += imageformats-private
+
+qtConfig(tiff): SUBDIRS += tiff
+qtConfig(webp): SUBDIRS += webp
 
 darwin: SUBDIRS += macheif
 
 qtConfig(regularexpression): \
     SUBDIRS += icns
 
-config_libmng: SUBDIRS += mng
-config_jasper {
+qtConfig(mng): SUBDIRS += mng
+qtConfig(jasper) {
     SUBDIRS += jp2
 } else:darwin: {
     SUBDIRS += macjp2
diff --git a/src/plugins/imageformats/jp2/jp2.pro b/src/plugins/imageformats/jp2/jp2.pro
index 4caeff3..d9fb4fa 100644
--- a/src/plugins/imageformats/jp2/jp2.pro
+++ b/src/plugins/imageformats/jp2/jp2.pro
@@ -5,8 +5,10 @@ SOURCES += main.cpp \
            qjp2handler.cpp
 OTHER_FILES += jp2.json
 
-msvc: LIBS += libjasper.lib
-else: LIBS += -ljasper
+include($$OUT_PWD/../../../imageformats/qtimageformats-config.pri)
+QT_FOR_CONFIG += imageformats-private
+
+QMAKE_USE_PRIVATE += jasper
 
 PLUGIN_TYPE = imageformats
 PLUGIN_CLASS_NAME = QJp2Plugin
diff --git a/src/plugins/imageformats/webp/webp.pro b/src/plugins/imageformats/webp/webp.pro
index 405c3b7..cea7c78 100644
--- a/src/plugins/imageformats/webp/webp.pro
+++ b/src/plugins/imageformats/webp/webp.pro
@@ -4,9 +4,11 @@ HEADERS += qwebphandler_p.h
 SOURCES += main.cpp qwebphandler.cpp
 OTHER_FILES += webp.json
 
-config_libwebp {
-    unix|win32-g++*: LIBS += -lwebp -lwebpdemux
-    else:win32: LIBS += libwebp.lib libwebpdemux.lib
+include($$OUT_PWD/../../../imageformats/qtimageformats-config.pri)
+QT_FOR_CONFIG += imageformats-private
+
+qtConfig(system-webp) {
+    QMAKE_USE += webp
 } else {
     include($$PWD/../../../3rdparty/libwebp.pri)
 }