diff options
| author | Christian Strømme <christian.stromme@theqtcompany.com> | 2016-01-15 17:27:32 +0100 |
|---|---|---|
| committer | Christian Strømme <christian.stromme@theqtcompany.com> | 2016-01-15 17:28:17 +0100 |
| commit | 84e426c3af2a3bb1b7f916e54263aea758db38d0 (patch) | |
| tree | 4fe09a8da5b15ba466e5771239d06f29a6c123da /src/plugins/wmf/wmf.pro | |
| parent | 84aaa48fdfc1f35c9870518a3d4b6f08a1f99449 (diff) | |
| parent | 924dc7f48c7003b46079623738ae531f34aed903 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/plugins/android/src/mediacapture/qandroidcamerasession.cpp
src/plugins/wmf/mftvideo.cpp
Change-Id: I78868b416ea4baec89ca3e2dc9eb4712db16d5fc
Diffstat (limited to 'src/plugins/wmf/wmf.pro')
| -rw-r--r-- | src/plugins/wmf/wmf.pro | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/plugins/wmf/wmf.pro b/src/plugins/wmf/wmf.pro index 68a777f37..1f43bb128 100644 --- a/src/plugins/wmf/wmf.pro +++ b/src/plugins/wmf/wmf.pro @@ -17,7 +17,6 @@ HEADERS += \ sourceresolver.h \ samplegrabber.h \ mftvideo.h \ - mfglobal.h \ mfactivate.h SOURCES += \ @@ -26,21 +25,7 @@ SOURCES += \ sourceresolver.cpp \ samplegrabber.cpp \ mftvideo.cpp \ - mfactivate.cpp \ - mfglobal.cpp - -contains(QT_CONFIG, angle)|contains(QT_CONFIG, dynamicgl) { - LIBS += -ld3d9 -ldxva2 -lwinmm -levr - QT += gui-private - - HEADERS += \ - $$PWD/evrcustompresenter.h \ - $$PWD/evrd3dpresentengine.h - - SOURCES += \ - $$PWD/evrcustompresenter.cpp \ - $$PWD/evrd3dpresentengine.cpp -} + mfactivate.cpp include (player/player.pri) include (decoder/decoder.pri) |