From af1c4059dcd9339cb3b00300836b0d7dfba3e195 Mon Sep 17 00:00:00 2001
From: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Wed, 24 Jun 2020 21:15:47 +0530
Subject: [PATCH] meson: Build Qt5 tests with -std=c++11
We already do this for the plugin.
https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues/780#note_548179
---
tests/examples/qt/qmloverlay/meson.build | 1 +
tests/examples/qt/qmlsink-dynamically-added/meson.build | 1 +
tests/examples/qt/qmlsink/meson.build | 1 +
tests/examples/qt/qmlsrc/meson.build | 1 +
4 files changed, 4 insertions(+)
diff --git a/tests/examples/qt/qmloverlay/meson.build b/tests/examples/qt/qmloverlay/meson.build
index ccf27e9e58..b1912463fb 100644
--- a/tests/examples/qt/qmloverlay/meson.build
+++ b/tests/examples/qt/qmloverlay/meson.build
@@ -5,6 +5,7 @@ sources = [
qt_preprocessed = qt5_mod.preprocess(qresources : 'qmloverlay.qrc')
executable('qmlgloverlay', sources, qt_preprocessed,
dependencies : [gst_dep, qt5qml_example_deps],
+ override_options : ['cpp_std=c++11'],
c_args : gst_plugins_good_args,
include_directories : [configinc],
install: false)
diff --git a/tests/examples/qt/qmlsink-dynamically-added/meson.build b/tests/examples/qt/qmlsink-dynamically-added/meson.build
index 31facae0a1..783011aa07 100644
--- a/tests/examples/qt/qmlsink-dynamically-added/meson.build
+++ b/tests/examples/qt/qmlsink-dynamically-added/meson.build
@@ -5,6 +5,7 @@ sources = [
qt_preprocessed = qt5_mod.preprocess(qresources : 'qmlsink-dyn-added.qrc')
executable('qmlsink-dynamically-added', sources, qt_preprocessed,
dependencies : [gst_dep, gstgl_dep, qt5qml_example_deps],
+ override_options : ['cpp_std=c++11'],
c_args : gst_plugins_good_args,
include_directories : [configinc],
install: false)
diff --git a/tests/examples/qt/qmlsink/meson.build b/tests/examples/qt/qmlsink/meson.build
index f2a7a16746..5e2d1c93b9 100644
--- a/tests/examples/qt/qmlsink/meson.build
+++ b/tests/examples/qt/qmlsink/meson.build
@@ -5,6 +5,7 @@ sources = [
qt_preprocessed = qt5_mod.preprocess(qresources : 'qmlsink.qrc')
executable('qmlsink', sources, qt_preprocessed,
dependencies : [gst_dep, qt5qml_example_deps],
+ override_options : ['cpp_std=c++11'],
c_args : gst_plugins_good_args,
include_directories : [configinc],
install: false)
diff --git a/tests/examples/qt/qmlsrc/meson.build b/tests/examples/qt/qmlsrc/meson.build
index 3d55a28cb1..c7f3add642 100644
--- a/tests/examples/qt/qmlsrc/meson.build
+++ b/tests/examples/qt/qmlsrc/meson.build
@@ -5,6 +5,7 @@ sources = [
qt_preprocessed = qt5_mod.preprocess(qresources : 'qmlsrc.qrc')
executable('qmlsrc', sources, qt_preprocessed,
dependencies : [gst_dep, qt5qml_example_deps],
+ override_options : ['cpp_std=c++11'],
c_args : gst_plugins_good_args,
include_directories : [configinc],
install: false)
--
GitLab