From 49c8471ef229e8dbac5a2661d6842648b055f6fc Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Thu, 16 Sep 2021 15:48:36 +0200
Subject: [PATCH] ClangTools: Adjust test files

Qt6 handles multimedia and multimediawidgets as add-on modules,
so they get installed only if explicitly checked while installing.
Make them optional for testing Qt6 as well.

Change-Id: I33b0686a61bf20ace790aa0c2bc27a5219d30aac
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 .../unit-tests/qt-essential-includes/main.cpp        |  4 ++++
 .../qt-essential-includes/qt-essential-includes.pro  | 12 +++++++++---
 .../qt-essential-includes/qt-essential-includes.qbs  |  5 +++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/plugins/clangtools/unit-tests/qt-essential-includes/main.cpp b/src/plugins/clangtools/unit-tests/qt-essential-includes/main.cpp
index 55f49d685f2..a60dcaef70a 100644
--- a/src/plugins/clangtools/unit-tests/qt-essential-includes/main.cpp
+++ b/src/plugins/clangtools/unit-tests/qt-essential-includes/main.cpp
@@ -1,7 +1,11 @@
 #include <QtCore>
 #include <QtGui>
+#ifdef QT_MULTIMEDIA_LIB
 #include <QtMultimedia>
+#endif
+#ifdef QT_MULTIMEDIAWIDGETS_LIB
 #include <QtMultimediaWidgets>
+#endif
 #include <QtNetwork>
 #include <QtQml>
 #include <QtQuick>
diff --git a/src/plugins/clangtools/unit-tests/qt-essential-includes/qt-essential-includes.pro b/src/plugins/clangtools/unit-tests/qt-essential-includes/qt-essential-includes.pro
index 2ff839a99a8..810b457b859 100644
--- a/src/plugins/clangtools/unit-tests/qt-essential-includes/qt-essential-includes.pro
+++ b/src/plugins/clangtools/unit-tests/qt-essential-includes/qt-essential-includes.pro
@@ -1,12 +1,18 @@
-QT += multimedia \
-      multimediawidgets \
-      network \
+QT += network \
       qml \
       quick \
       sql \
       testlib \
       widgets
 
+qtHaveModule(multimedia) {
+    QT += multimedia
+}
+
+qtHaveModule(multimediawidgets) {
+    QT += multimediawidgets
+}
+
 TARGET = qt-essential-includes
 TEMPLATE = app
 SOURCES += main.cpp
diff --git a/src/plugins/clangtools/unit-tests/qt-essential-includes/qt-essential-includes.qbs b/src/plugins/clangtools/unit-tests/qt-essential-includes/qt-essential-includes.qbs
index d0b90bdacdb..0b1d0c0658e 100644
--- a/src/plugins/clangtools/unit-tests/qt-essential-includes/qt-essential-includes.qbs
+++ b/src/plugins/clangtools/unit-tests/qt-essential-includes/qt-essential-includes.qbs
@@ -6,8 +6,6 @@ QtApplication {
     Depends {
         name: "Qt"
         submodules: [
-            "multimedia",
-            "multimediawidgets",
             "network",
             "qml",
             "quick",
@@ -17,6 +15,9 @@ QtApplication {
         ]
     }
 
+    Depends { name: "Qt.multimedia"; required: false }
+    Depends { name: "Qt.multimediawidgets"; required: false }
+
     files : [
         "main.cpp",
     ]