4 files changed, 9 insertions, 11 deletions
diff --git a/src/plugins/directshow/camera/camera.pri b/src/plugins/directshow/camera/camera.pri
index 6c67a8fe2..fb7fbd3f5 100644
--- a/src/plugins/directshow/camera/camera.pri
+++ b/src/plugins/directshow/camera/camera.pri
@@ -28,4 +28,4 @@ SOURCES += \
     $$PWD/dscameraimageprocessingcontrol.cpp
 
 *-msvc*:INCLUDEPATH += $$(DXSDK_DIR)/include
-LIBS += -lstrmiids -ldmoguids -luuid -lmsdmo -lole32 -loleaut32
+QMAKE_USE += directshow
diff --git a/src/plugins/directshow/camera/dscameraservice.h b/src/plugins/directshow/camera/dscameraservice.h
index dd5a7b9e3..8976e41cf 100644
--- a/src/plugins/directshow/camera/dscameraservice.h
+++ b/src/plugins/directshow/camera/dscameraservice.h
@@ -48,7 +48,6 @@ QT_BEGIN_NAMESPACE
 
 class DSCameraControl;
 class DSCameraSession;
-class DSVideoOutputControl;
 class DSVideoDeviceControl;
 class DSImageCaptureControl;
 class DSCameraViewfinderSettingsControl;
@@ -68,7 +67,6 @@ public:
 private:
     DSCameraControl        *m_control;
     DSCameraSession        *m_session;
-    DSVideoOutputControl   *m_videoOutput;
     DSVideoDeviceControl   *m_videoDevice;
     QMediaControl          *m_videoRenderer;
     DSImageCaptureControl  *m_imageCapture;
diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro
index 10c6fe2b6..5eb4fbc96 100644
--- a/src/plugins/directshow/directshow.pro
+++ b/src/plugins/directshow/directshow.pro
@@ -1,19 +1,19 @@
 TARGET = dsengine
+QT += multimedia-private
+
 win32:!qtHaveModule(opengl)|qtConfig(dynamicgl) {
     LIBS_PRIVATE += -lgdi32 -luser32
 }
 
-QT += multimedia-private
-
 HEADERS += dsserviceplugin.h
 SOURCES += dsserviceplugin.cpp
 
-!config_wmsdk: DEFINES += QT_NO_WMSDK
+!qtConfig(wmsdk): DEFINES += QT_NO_WMSDK
 
 mingw: DEFINES += NO_DSHOW_STRSAFE
 
 include(helpers/helpers.pri)
-!config_wmf: include(player/player.pri)
+!qtConfig(wmf-backend): include(player/player.pri)
 include(camera/camera.pri)
 
 OTHER_FILES += \
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