examples: qmlsink: rename qrc file to avoid naming conflicts with older meson versions
authorTim-Philipp Müller <tim@centricular.com>
Thu, 18 Jun 2020 09:47:28 +0000 (10:47 +0100)
committerTim-Philipp Müller <tim@centricular.com>
Thu, 18 Jun 2020 09:58:32 +0000 (10:58 +0100)
Would get "Tried to create target "qt5-qmlsink_qrc", but a
target of that name already exists." with older meson versions.

Work around that by renaming the qrc file.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/633>

tests/examples/qt/qmlsink-dynamically-added/meson.build
tests/examples/qt/qmlsink-dynamically-added/play.pro
tests/examples/qt/qmlsink-dynamically-added/qmlsink-dyn-added.qrc [moved from tests/examples/qt/qmlsink-dynamically-added/qmlsink.qrc with 100% similarity]

index b4eb78b..31facae 100644 (file)
@@ -2,7 +2,7 @@ sources = [
   'main.cpp',
 ]
 
-qt_preprocessed = qt5_mod.preprocess(qresources : 'qmlsink.qrc')
+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],
     c_args : gst_plugins_good_args,
index 9ecaf87..2e8192f 100644 (file)
@@ -14,7 +14,7 @@ INCLUDEPATH += ../lib
 
 SOURCES += main.cpp
 
-RESOURCES += qmlsink.qrc
+RESOURCES += qmlsink-dyn-added.qrc
 
 # Additional import path used to resolve QML modules in Qt Creator's code model
 QML_IMPORT_PATH =