From 0ba85c84a1a15daf874e45032e09275766f6a3a3 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Wed, 21 May 2025 20:23:47 +0530 Subject: [PATCH] meson: Make qml/qml6 plugins use the right qt detection method Otherwise they can pick up the wrong qt and cause two different Qt instances to be used in the same program. Part-of: --- subprojects/gst-plugins-good/tests/examples/qt/meson.build | 2 +- subprojects/gst-plugins-good/tests/examples/qt6/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/subprojects/gst-plugins-good/tests/examples/qt/meson.build b/subprojects/gst-plugins-good/tests/examples/qt/meson.build index 08c477ddc2..c073d4a899 100644 --- a/subprojects/gst-plugins-good/tests/examples/qt/meson.build +++ b/subprojects/gst-plugins-good/tests/examples/qt/meson.build @@ -8,7 +8,7 @@ if not qt5qml_dep.found() endif qt5qml_example_deps = dependency('qt5', modules : ['Core', 'Gui', 'Widgets', 'Qml', 'Quick'], - required: get_option('examples')) + method: qt5_method, required: get_option('examples')) if not qt5qml_example_deps.found() subdir_done() diff --git a/subprojects/gst-plugins-good/tests/examples/qt6/meson.build b/subprojects/gst-plugins-good/tests/examples/qt6/meson.build index 9e8f83574c..19db5a41f7 100644 --- a/subprojects/gst-plugins-good/tests/examples/qt6/meson.build +++ b/subprojects/gst-plugins-good/tests/examples/qt6/meson.build @@ -8,7 +8,7 @@ if not qt6qml_dep.found() endif qt6qml_example_deps = dependency('qt6', modules : ['Core', 'Gui', 'Widgets', 'Qml', 'Quick'], - required: get_option('examples')) + method: qt6_method, required: get_option('examples')) if not qt6qml_example_deps.found() subdir_done()