diff options
author | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:27:27 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:51:09 +0100 |
commit | e964e89331f2cfef99a3f63172a127b6c02a9727 (patch) | |
tree | 4c7d78573d17e523e4278027cee8fa88494366c8 /src/plugins/directshow/player/player.pri | |
parent | f09d36708fdab70ad51af374a65ddded64525f67 (diff) | |
parent | 6f7192a048432e4792330244b74a2a39ccd8d515 (diff) |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/plugins/gstreamer/camerabin/camerabincontainer.h
Change-Id: I4942d41d69112335fe0c994002f1b32ef3aad051
Diffstat (limited to 'src/plugins/directshow/player/player.pri')
-rw-r--r-- | src/plugins/directshow/player/player.pri | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/plugins/directshow/player/player.pri b/src/plugins/directshow/player/player.pri index 7391ec7f0..59ac5a330 100644 --- a/src/plugins/directshow/player/player.pri +++ b/src/plugins/directshow/player/player.pri @@ -5,8 +5,6 @@ LIBS += -lgdi32 qtHaveModule(widgets): QT += widgets -DEFINES += QMEDIA_DIRECTSHOW_PLAYER - HEADERS += \ $$PWD/directshowioreader.h \ $$PWD/directshowiosource.h \ @@ -30,8 +28,6 @@ SOURCES += \ $$PWD/vmr9videowindowcontrol.cpp qtConfig(evr) { - DEFINES += HAVE_EVR - include($$PWD/../../common/evr.pri) HEADERS += \ @@ -41,8 +37,5 @@ qtConfig(evr) { $$PWD/directshowevrvideowindowcontrol.cpp } -qtConfig(wshellitem) { +qtConfig(wshellitem): \ QT += core-private -} else { - DEFINES += QT_NO_SHELLITEM -} |