Properly handle the case where QtWidgets is not available.

It does use a config test for now, just to make it clearer.  The Mac
backend currently requires widgets, but most of the others should work
without it (just not supporting QVideoWidget/WindowControl).

The QVideoDeviceControl interface was modified to remove the QIcon
usage - it was never implemented.

Unfortunately even the QML examples need widgets for the wrapper
application, and will need to be ported to QtGui based wrapper.

Change-Id: I8a55ad5cf09ab51749510bf16f49de0bd3f0bcdb
Reviewed-by: Ling Hu <ling.hu@nokia.com>

src/plugins/directshow/camera/camera.pri

@@ -13,19 +13,21 @@ HEADERS += \
     $$PWD/dsvideodevicecontrol.h \
     $$PWD/dsimagecapturecontrol.h \
     $$PWD/dscamerasession.h \
-    $$PWD/dsvideowidgetcontrol.h \
     $$PWD/dscameraservice.h \
     $$PWD/directshowglobal.h
 
-
 SOURCES += \
     $$PWD/dscameraservice.cpp \
     $$PWD/dscameracontrol.cpp \
     $$PWD/dsvideorenderer.cpp \
     $$PWD/dsvideodevicecontrol.cpp \
     $$PWD/dsimagecapturecontrol.cpp \
-    $$PWD/dscamerasession.cpp \
-    $$PWD/dsvideowidgetcontrol.cpp
+    $$PWD/dscamerasession.cpp
+
+contains(config_test_widgets, yes) {
+    HEADERS += $$PWD/dsvideowidgetcontrol.h
+    SOURCES += $$PWD/dsvideowidgetcontrol.cpp
+}
 
 INCLUDEPATH += $(DXSDK_DIR)/include
 LIBS += -lstrmiids -ldmoguids -luuid -lmsdmo -lole32 -loleaut32

src/plugins/directshow/camera/dscameraservice.cpp

@@ -41,9 +41,11 @@
 
 #include <QtCore/qvariant.h>
 #include <QtCore/qdebug.h>
+
+#if defined(HAVE_WIDGETS)
 #include <QtWidgets/qwidget.h>
 #include <QVideoWidgetControl.h>
-
+#endif
 
 #include "dscameraservice.h"
 #include "dscameracontrol.h"
@@ -51,7 +53,10 @@
 #include "dsvideorenderer.h"
 #include "dsvideodevicecontrol.h"
 #include "dsimagecapturecontrol.h"
+
+#if defined(HAVE_WIDGETS)
 #include "dsvideowidgetcontrol.h"
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -68,7 +73,9 @@ DSCameraService::DSCameraService(QObject *parent):
 
     m_imageCapture = new DSImageCaptureControl(m_session);
 
+#if defined(HAVE_WIDGETS)
     m_viewFinderWidget = new DSVideoWidgetControl(m_session);
+#endif
 
     m_device = QByteArray("default");
 }
@@ -79,7 +86,9 @@ DSCameraService::~DSCameraService()
     delete m_videoDevice;
     delete m_videoRenderer;
     delete m_imageCapture;
+#if defined(HAVE_WIDGETS)
     delete m_viewFinderWidget;
+#endif
     delete m_session;
 }
 
@@ -91,11 +100,13 @@ QMediaControl* DSCameraService::requestControl(const char *name)
     if (qstrcmp(name, QCameraImageCaptureControl_iid) == 0)
         return m_imageCapture;
 
+#if defined(HAVE_WIDGETS)
     if (qstrcmp(name, QVideoWidgetControl_iid) == 0) {
         if (m_viewFinderWidget) {
             return m_viewFinderWidget;
         }
     }
+#endif
 
     if(qstrcmp(name,QVideoRendererControl_iid) == 0)
         return m_videoRenderer;

src/plugins/directshow/camera/dscameraservice.h

@@ -74,7 +74,9 @@ private:
     DSCameraControl        *m_control;
     DSCameraSession        *m_session;
     DSVideoOutputControl   *m_videoOutput;
+#if defined(HAVE_WIDGETS)
     DSVideoWidgetControl   *m_viewFinderWidget;
+#endif
     DSVideoDeviceControl   *m_videoDevice;
     DSVideoRendererControl *m_videoRenderer;
     DSImageCaptureControl  *m_imageCapture;

src/plugins/directshow/camera/dsvideodevicecontrol.cpp

@@ -41,7 +41,6 @@
 
 #include <QDebug>
 #include <QFile>
-#include <QtWidgets/QIcon>
 
 #include "dsvideodevicecontrol.h"
 #include "dscamerasession.h"
@@ -135,13 +134,6 @@ QString DSVideoDeviceControl::deviceDescription(int index) const
     return QString();
 }
 
-QIcon DSVideoDeviceControl::deviceIcon(int index) const
-{
-    Q_UNUSED(index)
-
-    return QIcon();
-}
-
 int DSVideoDeviceControl::defaultDevice() const
 {
     return 0;

src/plugins/directshow/camera/dsvideodevicecontrol.h

@@ -60,7 +60,6 @@ public:
     int deviceCount() const;
     QString deviceName(int index) const;
     QString deviceDescription(int index) const;
-    QIcon deviceIcon(int index) const;
     int defaultDevice() const;
     int selectedDevice() const;
 

src/plugins/directshow/directshow.pro

@@ -5,8 +5,6 @@ TARGET = $$qtLibraryTarget(dsengine)
 
 PLUGIN_TYPE=mediaservice
 
-include (../../../common.pri)
-
 QT += multimedia
 
 DEPENDPATH += .
@@ -16,8 +14,13 @@ SOURCES += dsserviceplugin.cpp
 
 !contains(config_test_wmsdk, yes): DEFINES += QT_NO_WMSDK
 
-contains(config_test_wmf, no): include (player/player.pri)
-include (camera/camera.pri)
+contains(config_test_widgets, yes) {
+    QT += multimediawidgets
+    DEFINES += HAVE_WIDGETS
+}
+
+contains(config_test_wmf, no): include(player/player.pri)
+include(camera/camera.pri)
 
 target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
 INSTALLS += target

src/plugins/directshow/player/directshowplayerservice.cpp

@@ -46,7 +46,7 @@
 #include "directshowmetadatacontrol.h"
 #include "directshowplayercontrol.h"
 #include "directshowvideorenderercontrol.h"
-#ifndef Q_WS_SIMULATOR
+#if defined(HAVE_WIDGETS) && !defined(Q_WS_SIMULATOR)
 #include "vmr9videowindowcontrol.h"
 #endif
 
@@ -83,7 +83,7 @@ DirectShowPlayerService::DirectShowPlayerService(QObject *parent)
     , m_playerControl(0)
     , m_metaDataControl(0)
     , m_videoRendererControl(0)
-#ifndef Q_WS_SIMULATOR
+#if defined(HAVE_WIDGETS) && !defined(Q_WS_SIMULATOR)
     , m_videoWindowControl(0)
 #endif
     , m_audioEndpointControl(0)
@@ -144,7 +144,7 @@ DirectShowPlayerService::~DirectShowPlayerService()
     delete m_audioEndpointControl;
     delete m_metaDataControl;
     delete m_videoRendererControl;
-#ifndef Q_WS_SIMULATOR
+#if defined(HAVE_WIDGETS) && !defined(Q_WS_SIMULATOR)
     delete m_videoWindowControl;
 #endif
 
@@ -161,7 +161,7 @@ QMediaControl *DirectShowPlayerService::requestControl(const char *name)
     } else if (qstrcmp(name, QMetaDataReaderControl_iid) == 0) {
         return m_metaDataControl;
     } else if (qstrcmp(name, QVideoRendererControl_iid) == 0) {
-#ifndef Q_WS_SIMULATOR
+#if defined(HAVE_WIDGETS) && !defined(Q_WS_SIMULATOR)
         if (!m_videoRendererControl && !m_videoWindowControl) {
 #else
         if (!m_videoRendererControl) {
@@ -173,7 +173,7 @@ QMediaControl *DirectShowPlayerService::requestControl(const char *name)
 
             return m_videoRendererControl;
         }
-#ifndef Q_WS_SIMULATOR
+#if defined(HAVE_WIDGETS) && !defined(Q_WS_SIMULATOR)
     } else if (qstrcmp(name, QVideoWindowControl_iid) == 0) {
         if (!m_videoRendererControl && !m_videoWindowControl) {
             m_videoWindowControl = new Vmr9VideoWindowControl;
@@ -198,7 +198,7 @@ void DirectShowPlayerService::releaseControl(QMediaControl *control)
         delete m_videoRendererControl;
 
         m_videoRendererControl = 0;
-#ifndef Q_WS_SIMULATOR
+#if defined(HAVE_WIDGETS) && !defined(Q_WS_SIMULATOR)
     } else if (control == m_videoWindowControl) {
         setVideoOutput(0);
 

src/plugins/directshow/player/directshowplayerservice.h

@@ -59,7 +59,7 @@ class DirectShowAudioEndpointControl;
 class DirectShowMetaDataControl;
 class DirectShowPlayerControl;
 class DirectShowVideoRendererControl;
-#ifndef Q_WS_SIMULATOR
+#if defined(HAVE_WIDGETS) && !defined(Q_WS_SIMULATOR)
 class Vmr9VideoWindowControl;
 #endif
 
@@ -180,7 +180,7 @@ private:
     DirectShowPlayerControl *m_playerControl;
     DirectShowMetaDataControl *m_metaDataControl;
     DirectShowVideoRendererControl *m_videoRendererControl;
-#ifndef Q_WS_SIMULATOR
+#if defined(HAVE_WIDGETS) && !defined(Q_WS_SIMULATOR)
     Vmr9VideoWindowControl *m_videoWindowControl;
 #endif
     DirectShowAudioEndpointControl *m_audioEndpointControl;

src/plugins/directshow/player/player.pri

@@ -35,11 +35,11 @@ SOURCES += \
         $$PWD/mediasamplevideobuffer.cpp \
         $$PWD/videosurfacefilter.cpp
 
-!simulator {
-HEADERS += \
+contains(config_test_widgets, yes):!simulator {
+    HEADERS += \
         $$PWD/vmr9videowindowcontrol.h
 
-SOURCES += \
+    SOURCES += \
         $$PWD/vmr9videowindowcontrol.cpp
 }