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 #include +#ifdef QT_MULTIMEDIA_LIB #include +#endif +#ifdef QT_MULTIMEDIAWIDGETS_LIB #include +#endif #include #include #include 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", ]