diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-12 09:48:13 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-12-12 10:27:59 +0100 |
| commit | 533759ef333e4db8625cd02f763994788da01199 (patch) | |
| tree | dcb4b4ec8882b42ce8213f4e309534dd8d234843 /src/plugins/qnx/mediaplayer/mediaplayer.pri | |
| parent | 31ed506ea2c7a8be439d77e02ca0d67b6f9ce675 (diff) | |
| parent | 7bc230386e0d8d6f3c4ad5a0a6a22a625c9a8327 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp
Change-Id: I7c30c2d13fdd07ee07e4449d5d3e256e988d3793
Diffstat (limited to 'src/plugins/qnx/mediaplayer/mediaplayer.pri')
| -rw-r--r-- | src/plugins/qnx/mediaplayer/mediaplayer.pri | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/src/plugins/qnx/mediaplayer/mediaplayer.pri b/src/plugins/qnx/mediaplayer/mediaplayer.pri index 9dedab0fd..756857cce 100644 --- a/src/plugins/qnx/mediaplayer/mediaplayer.pri +++ b/src/plugins/qnx/mediaplayer/mediaplayer.pri @@ -7,8 +7,8 @@ HEADERS += \ $$PWD/mmrenderermetadatareadercontrol.h \ $$PWD/mmrendererplayervideorenderercontrol.h \ $$PWD/mmrendererutil.h \ - $$PWD/mmrenderervideowindowcontrol.h - + $$PWD/mmrenderervideowindowcontrol.h \ + $$PWD/ppsmediaplayercontrol.h SOURCES += \ $$PWD/mmrenderermediaplayercontrol.cpp \ $$PWD/mmrenderermediaplayerservice.cpp \ @@ -16,16 +16,7 @@ SOURCES += \ $$PWD/mmrenderermetadatareadercontrol.cpp \ $$PWD/mmrendererplayervideorenderercontrol.cpp \ $$PWD/mmrendererutil.cpp \ - $$PWD/mmrenderervideowindowcontrol.cpp - -LIBS += -lmmrndclient -lstrm + $$PWD/mmrenderervideowindowcontrol.cpp \ + $$PWD/ppsmediaplayercontrol.cpp -blackberry { - HEADERS += $$PWD/bpsmediaplayercontrol.h - SOURCES += $$PWD/bpsmediaplayercontrol.cpp -} else { - HEADERS += $$PWD/ppsmediaplayercontrol.h - SOURCES += $$PWD/ppsmediaplayercontrol.cpp - QT += core-private - LIBS += -lpps -} +QMAKE_USE += mmrenderer pps |