Merge pull request #403 from valbok/examples-def

Define multimedia in pro examples
valbok · Sep 10, 2023 · 53c12f0 · 53c12f0
2 parents 259bf26 + 1b9f72b
commit 53c12f0
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git 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,24 +196,24 @@ 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
 
       - name: Examples
         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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,5 @@
 TARGET = tst_qavplayer
-
+DEFINES+="QT_AVPLAYER_MULTIMEDIA"
 INCLUDEPATH += ../../../../src/ ../../../../src/QtAVPlayer
 include(../../../../src/QtAVPlayer/QtAVPlayer.pri)