diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-10-26 16:15:20 +0200 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-11-14 17:03:21 +0000 |
| commit | f0ea26416a73e9ed60e0e0440275e73081f601a2 (patch) | |
| tree | fc757ae3e14e32be4bd4bcd3629d79527308907a /src/plugins/directshow/player/player.pri | |
| parent | d5ab3ab8703ef04cc06d78983bf1a39ecfe99bb4 (diff) | |
Move qtmultimedia over to the new config system
Use the new configuration system to define external
libraries, configure tests and features. Don't use
pkg-config outside of the configuration step. And
move all command line options over from qtbase, so
that we can remove them from there in a second step.
Change-Id: I1aa4b557a6aee17eeceb00602005a2d28b426a26
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Diffstat (limited to 'src/plugins/directshow/player/player.pri')
| -rw-r--r-- | src/plugins/directshow/player/player.pri | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/directshow/player/player.pri b/src/plugins/directshow/player/player.pri index 8b4bb70b7..7391ec7f0 100644 --- a/src/plugins/directshow/player/player.pri +++ b/src/plugins/directshow/player/player.pri @@ -1,7 +1,7 @@ INCLUDEPATH += $$PWD -LIBS += -lstrmiids -ldmoguids -luuid -lole32 -loleaut32 -lmsdmo -lgdi32 - +QMAKE_USE += directshow +LIBS += -lgdi32 qtHaveModule(widgets): QT += widgets @@ -29,7 +29,7 @@ SOURCES += \ $$PWD/directshowmetadatacontrol.cpp \ $$PWD/vmr9videowindowcontrol.cpp -config_evr { +qtConfig(evr) { DEFINES += HAVE_EVR include($$PWD/../../common/evr.pri) @@ -41,7 +41,7 @@ config_evr { $$PWD/directshowevrvideowindowcontrol.cpp } -config_wshellitem { +qtConfig(wshellitem) { QT += core-private } else { DEFINES += QT_NO_SHELLITEM |