From 1b9f72be3c99e5f6cc92bd03199f2f3033b9ca98 Mon Sep 17 00:00:00 2001
From: Val Doroshchuk <valbok@gmail.com>
Date: Sun, 10 Sep 2023 19:04:41 +0200
Subject: [PATCH] Define multimedia in pro examples

---
 .github/workflows/main.yaml                   | 20 +++++++++----------
 examples/qml_video/qml_video.pro              |  1 +
 examples/widget_video/widget_video.pro        |  1 +
 .../integration/qavdemuxer/qavdemuxer.pro     |  1 -
 .../auto/integration/qavplayer/qavplayer.pro  |  2 +-
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 2dc1231c..f81cff79 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -56,14 +56,14 @@ jobs:
           make CC=$CC CXX=$CXX
           ./tst_qavdemuxer
           cd ../qavplayer
-          qmake DEFINES+="QT_AVPLAYER_MULTIMEDIA"
+          qmake
           make CC=$CC CXX=$CXX
           ./tst_qavplayer --platform minimal -maxwarnings 100000
 
       - name: Examples
         run: |
           cd examples/qml_video
-          qmake DEFINES+="QT_AVPLAYER_MULTIMEDIA"
+          qmake
           make CC=$CC CXX=$CXX
 
   macos:
@@ -100,14 +100,14 @@ jobs:
           make CC=$CC CXX=$CXX
           tst_qavdemuxer.app/Contents/MacOS/tst_qavdemuxer
           cd ../qavplayer
-          qmake DEFINES+="QT_AVPLAYER_MULTIMEDIA" INCLUDEPATH+="/usr/local/Cellar/ffmpeg/6.0_1/include" LIBS="-L/usr/local/Cellar/ffmpeg/6.0_1/lib"
+          qmake INCLUDEPATH+="/usr/local/Cellar/ffmpeg/6.0_1/include" LIBS="-L/usr/local/Cellar/ffmpeg/6.0_1/lib"
           make CC=$CC CXX=$CXX
           tst_qavplayer.app/Contents/MacOS/tst_qavplayer --platform minimal -maxwarnings 100000
 
       - name: Examples
         run: |
           cd examples/qml_video
-          qmake DEFINES+="QT_AVPLAYER_MULTIMEDIA" INCLUDEPATH+="/usr/local/Cellar/ffmpeg/6.0_1/include" LIBS+="-L/usr/local/Cellar/ffmpeg/6.0_1/lib"
+          qmake INCLUDEPATH+="/usr/local/Cellar/ffmpeg/6.0_1/include" LIBS+="-L/usr/local/Cellar/ffmpeg/6.0_1/lib"
           make CC=$CC CXX=$CXX
 
   windows:
@@ -179,12 +179,12 @@ jobs:
           set QT_FORCE_STDERR_LOGGING=1
           set QT_ASSUME_STDERR_HAS_CONSOLE=1
           cd tests/auto/integration/qavdemuxer
-          qmake DEFINES+="QT_AVPLAYER_MULTIMEDIA"
+          qmake
           nmake
           release\tst_qavdemuxer.exe
           cd ../qavplayer
           cd qavplayer
-          qmake DEFINES+="QT_AVPLAYER_MULTIMEDIA"
+          qmake
           nmake
           release\tst_qavplayer.exe -maxwarnings 100000
 
@@ -196,11 +196,11 @@ jobs:
           set QT_FORCE_STDERR_LOGGING=1
           set QT_ASSUME_STDERR_HAS_CONSOLE=1
           cd tests/auto/integration/qavdemuxer
-          qmake DEFINES+="QT_AVPLAYER_MULTIMEDIA"
+          qmake
           mingw32-make
           release\tst_qavdemuxer.exe
           cd ../qavplayer
-          qmake DEFINES+="QT_AVPLAYER_MULTIMEDIA"
+          qmake
           mingw32-make
           release\tst_qavplayer.exe -maxwarnings 100000
 
@@ -208,12 +208,12 @@ jobs:
         if: ${{ matrix.type == 'MSVC' }}
         run: |
           cd examples/qml_video
-          qmake DEFINES+="QT_AVPLAYER_MULTIMEDIA"
+          qmake
           nmake
 
       - name: Examples
         if: ${{ matrix.type == 'MINGW' }}
         run: |
           cd examples/qml_video
-          qmake DEFINES+="QT_AVPLAYER_MULTIMEDIA"
+          qmake
           mingw32-make
diff --git a/examples/qml_video/qml_video.pro b/examples/qml_video/qml_video.pro
index 8b9e6ea7..891a115f 100644
--- a/examples/qml_video/qml_video.pro
+++ b/examples/qml_video/qml_video.pro
@@ -1,5 +1,6 @@
 TEMPLATE = app
 TARGET = qml_video
+DEFINES+="QT_AVPLAYER_MULTIMEDIA"
 INCLUDEPATH += . ../../src
 include(../../src/QtAVPlayer/QtAVPlayer.pri)
 # Example
diff --git a/examples/widget_video/widget_video.pro b/examples/widget_video/widget_video.pro
index ff87ad20..f18b6d66 100644
--- a/examples/widget_video/widget_video.pro
+++ b/examples/widget_video/widget_video.pro
@@ -1,5 +1,6 @@
 TEMPLATE = app
 TARGET = widget_video
+DEFINES+="QT_AVPLAYER_MULTIMEDIA"
 INCLUDEPATH += . ../../src
 include(../../src/QtAVPlayer/QtAVPlayer.pri)
 
diff --git a/tests/auto/integration/qavdemuxer/qavdemuxer.pro b/tests/auto/integration/qavdemuxer/qavdemuxer.pro
index 513f429b..adc8204a 100644
--- a/tests/auto/integration/qavdemuxer/qavdemuxer.pro
+++ b/tests/auto/integration/qavdemuxer/qavdemuxer.pro
@@ -1,5 +1,4 @@
 TARGET = tst_qavdemuxer
-
 INCLUDEPATH += ../../../../src/ ../../../../src/QtAVPlayer
 include(../../../../src/QtAVPlayer/QtAVPlayer.pri)
 
diff --git a/tests/auto/integration/qavplayer/qavplayer.pro b/tests/auto/integration/qavplayer/qavplayer.pro
index def98607..63fa9301 100644
--- a/tests/auto/integration/qavplayer/qavplayer.pro
+++ b/tests/auto/integration/qavplayer/qavplayer.pro
@@ -1,5 +1,5 @@
 TARGET = tst_qavplayer
-
+DEFINES+="QT_AVPLAYER_MULTIMEDIA"
 INCLUDEPATH += ../../../../src/ ../../../../src/QtAVPlayer
 include(../../../../src/QtAVPlayer/QtAVPlayer.pri)