diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:43:04 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:43:04 +0200 |
| commit | c3ea9be0d49ec1eecda9d07e933d5426ed52670a (patch) | |
| tree | 2522225f27fdf1a139b167ea612a5bb016e4eb22 /src/plugins/directshow/directshow.pro | |
| parent | 11eb454e7f53a5ddc81458b57afe2605c8fa5d4d (diff) | |
| parent | d32aff3e0453475c1a22d5e8c7a106df18c0ad10 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Ie1331c18854bea488c773807597f8ad209437657
Diffstat (limited to 'src/plugins/directshow/directshow.pro')
| -rw-r--r-- | src/plugins/directshow/directshow.pro | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro index 4d7183923..117b02ade 100644 --- a/src/plugins/directshow/directshow.pro +++ b/src/plugins/directshow/directshow.pro @@ -2,9 +2,6 @@ TARGET = dsengine win32:!qtHaveModule(opengl)|contains(QT_CONFIG,dynamicgl) { LIBS_PRIVATE += -lgdi32 -luser32 } -PLUGIN_TYPE=mediaservice -PLUGIN_CLASS_NAME = DSServicePlugin -load(qt_plugin) QT += multimedia-private @@ -16,8 +13,12 @@ SOURCES += dsserviceplugin.cpp mingw: DEFINES += NO_DSHOW_STRSAFE !config_wmf: include(player/player.pri) -include(camera/camera.pri) +!wince: include(camera/camera.pri) OTHER_FILES += \ directshow.json \ directshow_camera.json + +PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = DSServicePlugin +load(qt_plugin) |