diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:06:52 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:52:58 +0200 |
| commit | 7fdb88a86b0782e7170eefe3dfe7ab3e9c81f847 (patch) | |
| tree | 0fb34738dd5b4abd222ffac7b25f904c456006d9 /src/plugins/directshow/helpers/helpers.pri | |
| parent | badecdbc46df6ada383f1dfd006fa3dfff1706c6 (diff) | |
| parent | a6cc1af0546ab10701c10475315139ebb50ad1e5 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: I20470ed193e818eefedd975d89f755fb9d673241
Diffstat (limited to 'src/plugins/directshow/helpers/helpers.pri')
| -rw-r--r-- | src/plugins/directshow/helpers/helpers.pri | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/plugins/directshow/helpers/helpers.pri b/src/plugins/directshow/helpers/helpers.pri deleted file mode 100644 index ca883eeb8..000000000 --- a/src/plugins/directshow/helpers/helpers.pri +++ /dev/null @@ -1,24 +0,0 @@ -INCLUDEPATH += $$PWD - -HEADERS += \ - $$PWD/directshowbasefilter.h \ - $$PWD/directshoweventloop.h \ - $$PWD/directshowglobal.h \ - $$PWD/directshowmediatype.h \ - $$PWD/directshowmediatypeenum.h \ - $$PWD/directshowobject.h \ - $$PWD/directshowpin.h \ - $$PWD/directshowpinenum.h \ - $$PWD/directshowvideobuffer.h \ - $$PWD/directshowutils.h - -SOURCES += \ - $$PWD/directshowbasefilter.cpp \ - $$PWD/directshoweventloop.cpp \ - $$PWD/directshowmediatype.cpp \ - $$PWD/directshowmediatypeenum.cpp \ - $$PWD/directshowobject.cpp \ - $$PWD/directshowpin.cpp \ - $$PWD/directshowpinenum.cpp \ - $$PWD/directshowvideobuffer.cpp \ - $$PWD/directshowutils.cpp |