Use QT_CONFIG macro to check for features

And remove many custom defines.

Change-Id: I658cc8430d1d99ed3c0aafe03a77adce76621a29
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>

7 files changed, 11 insertions, 29 deletions

diff --git a/src/plugins/directshow/camera/camera.pri b/src/plugins/directshow/camera/camera.pri
index afe77fc56..d8ee59aa9 100644
--- a/src/plugins/directshow/camera/camera.pri
+++ b/src/plugins/directshow/camera/camera.pri
@@ -1,7 +1,5 @@
 INCLUDEPATH += $$PWD
 
-DEFINES += QMEDIA_DIRECTSHOW_CAMERA
-
 win32: DEFINES += _CRT_SECURE_NO_WARNINGS
 
 HEADERS += \
diff --git a/src/plugins/directshow/dsserviceplugin.cpp b/src/plugins/directshow/dsserviceplugin.cpp
index 6f31ce7e2..6d8f97f52 100644
--- a/src/plugins/directshow/dsserviceplugin.cpp
+++ b/src/plugins/directshow/dsserviceplugin.cpp
@@ -37,6 +37,7 @@
 **
 ****************************************************************************/
 
+#include <QtMultimedia/private/qtmultimediaglobal_p.h>
 #include <dshow.h>
 
 #include <QtCore/qstring.h>
@@ -45,21 +46,16 @@
 
 #include "dsserviceplugin.h"
 
-#ifdef QMEDIA_DIRECTSHOW_CAMERA
 #include "dsvideodevicecontrol.h"
 #include <dshow.h>
 #include "dscameraservice.h"
-#endif
 
-#ifdef QMEDIA_DIRECTSHOW_PLAYER
+#if QT_CONFIG(directshow_player)
 #include "directshowplayerservice.h"
 #endif
 
 #include <qmediaserviceproviderplugin.h>
 
-
-#ifdef QMEDIA_DIRECTSHOW_CAMERA
-
 extern const CLSID CLSID_VideoInputDeviceCategory;
 
 
@@ -75,7 +71,6 @@ extern const CLSID CLSID_VideoInputDeviceCategory;
 #endif // Q_CC_MSVC
 #include <windows.h>
 #include <ocidl.h>
-#endif
 
 QT_USE_NAMESPACE
 
@@ -94,13 +89,11 @@ void releaseRefCount()
 
 QMediaService* DSServicePlugin::create(QString const& key)
 {
-#ifdef QMEDIA_DIRECTSHOW_CAMERA
     if (key == QLatin1String(Q_MEDIASERVICE_CAMERA)) {
         addRefCount();
         return new DSCameraService;
     }
-#endif
-#ifdef QMEDIA_DIRECTSHOW_PLAYER
+#if QT_CONFIG(directshow_player)
     if (key == QLatin1String(Q_MEDIASERVICE_MEDIAPLAYER)) {
         addRefCount();
         return new DirectShowPlayerService;
@@ -127,14 +120,11 @@ QMediaServiceProviderHint::Features DSServicePlugin::supportedFeatures(
 
 QByteArray DSServicePlugin::defaultDevice(const QByteArray &service) const
 {
-#ifdef QMEDIA_DIRECTSHOW_CAMERA
     if (service == Q_MEDIASERVICE_CAMERA) {
         const QList<DSVideoDeviceInfo> &devs = DSVideoDeviceControl::availableDevices();
         if (!devs.isEmpty())
             return devs.first().first;
     }
-#endif
-
     return QByteArray();
 }
 
@@ -142,20 +132,17 @@ QList<QByteArray> DSServicePlugin::devices(const QByteArray &service) const
 {
     QList<QByteArray> result;
 
-#ifdef QMEDIA_DIRECTSHOW_CAMERA
     if (service == Q_MEDIASERVICE_CAMERA) {
         const QList<DSVideoDeviceInfo> &devs = DSVideoDeviceControl::availableDevices();
         for (const DSVideoDeviceInfo &info : devs)
             result.append(info.first);
     }
-#endif
 
     return result;
 }
 
 QString DSServicePlugin::deviceDescription(const QByteArray &service, const QByteArray &device)
 {
-#ifdef QMEDIA_DIRECTSHOW_CAMERA
     if (service == Q_MEDIASERVICE_CAMERA) {
         const QList<DSVideoDeviceInfo> &devs = DSVideoDeviceControl::availableDevices();
         for (const DSVideoDeviceInfo &info : devs) {
@@ -163,6 +150,5 @@ QString DSServicePlugin::deviceDescription(const QByteArray &service, const QByt
                 return info.second;
         }
     }
-#endif
     return QString();
 }
diff --git a/src/plugins/directshow/dsserviceplugin.h b/src/plugins/directshow/dsserviceplugin.h
index 8470fc3b5..b7ac6a86e 100644
--- a/src/plugins/directshow/dsserviceplugin.h
+++ b/src/plugins/directshow/dsserviceplugin.h
@@ -40,6 +40,7 @@
 #ifndef DSSERVICEPLUGIN_H
 #define DSSERVICEPLUGIN_H
 
+#include <QtMultimedia/private/qtmultimediaglobal_p.h>
 #include "qmediaserviceproviderplugin.h"
 
 QT_USE_NAMESPACE
@@ -56,7 +57,7 @@ class DSServicePlugin
     Q_INTERFACES(QMediaServiceFeaturesInterface)
     // The player service provided by the WMF-plugin should preferably be used.
     // DirectShow should then only provide the camera (see QTBUG-29172, QTBUG-29175).
-#ifdef QMEDIA_DIRECTSHOW_PLAYER
+#if QT_CONFIG(directshow_player)
     Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "directshow.json")
 #else
     Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "directshow_camera.json")
diff --git a/src/plugins/directshow/player/directshowmetadatacontrol.cpp b/src/plugins/directshow/player/directshowmetadatacontrol.cpp
index ccd408a8a..45d3a958b 100644
--- a/src/plugins/directshow/player/directshowmetadatacontrol.cpp
+++ b/src/plugins/directshow/player/directshowmetadatacontrol.cpp
@@ -63,7 +63,7 @@
 #include <wmsdk.h>
 #endif
 
-#ifndef QT_NO_SHELLITEM
+#if QT_CONFIG(wshellitem)
 #include <ShlObj.h>
 #include <propkeydef.h>
 #include <private/qsystemlibrary_p.h>
@@ -292,7 +292,7 @@ static QVariant getValue(IWMHeaderInfo *header, const wchar_t *key)
 }
 #endif
 
-#ifndef QT_NO_SHELLITEM
+#if QT_CONFIG(wshellitem)
 static QVariant convertValue(const PROPVARIANT& var)
 {
     QVariant value;
@@ -392,7 +392,7 @@ void DirectShowMetaDataControl::updateMetadata(IFilterGraph2 *graph, IBaseFilter
 {
     m_metadata.clear();
 
-#ifndef QT_NO_SHELLITEM
+#if QT_CONFIG(wshellitem)
     if (!sHCreateItemFromParsingName) {
         QSystemLibrary lib(QStringLiteral("shell32"));
         sHCreateItemFromParsingName = (q_SHCreateItemFromParsingName)(lib.resolve("SHCreateItemFromParsingName"));
diff --git a/src/plugins/directshow/player/directshowvideorenderercontrol.cpp b/src/plugins/directshow/player/directshowvideorenderercontrol.cpp
index b726040b3..40f77e899 100644
--- a/src/plugins/directshow/player/directshowvideorenderercontrol.cpp
+++ b/src/plugins/directshow/player/directshowvideorenderercontrol.cpp
@@ -37,6 +37,7 @@
 **
 ****************************************************************************/
 
+#include <QtMultimedia/private/qtmultimediaglobal_p.h>
 #include "directshowvideorenderercontrol.h"
 
 #include "videosurfacefilter.h"
diff --git a/src/plugins/directshow/player/directshowvideorenderercontrol.h b/src/plugins/directshow/player/directshowvideorenderercontrol.h
index 1df5d6864..36c5b2248 100644
--- a/src/plugins/directshow/player/directshowvideorenderercontrol.h
+++ b/src/plugins/directshow/player/directshowvideorenderercontrol.h
@@ -40,6 +40,7 @@
 #ifndef DIRECTSHOWVIDEORENDERERCONTROL_H
 #define DIRECTSHOWVIDEORENDERERCONTROL_H
 
+#include <QtMultimedia/private/qtmultimediaglobal_p.h>
 #include <dshow.h>
 
 #include "qvideorenderercontrol.h"
diff --git a/src/plugins/directshow/player/player.pri b/src/plugins/directshow/player/player.pri
index 18817b879..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 \
@@ -39,8 +37,5 @@ qtConfig(evr) {
         $$PWD/directshowevrvideowindowcontrol.cpp
 }
 
-qtConfig(wshellitem) {
+qtConfig(wshellitem): \
     QT += core-private
-} else {
-    DEFINES += QT_NO_SHELLITEM
-}