diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:27:27 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:51:09 +0100 |
| commit | e964e89331f2cfef99a3f63172a127b6c02a9727 (patch) | |
| tree | 4c7d78573d17e523e4278027cee8fa88494366c8 /src/plugins/directshow/player/directshowmetadatacontrol.cpp | |
| parent | f09d36708fdab70ad51af374a65ddded64525f67 (diff) | |
| parent | 6f7192a048432e4792330244b74a2a39ccd8d515 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/plugins/gstreamer/camerabin/camerabincontainer.h
Change-Id: I4942d41d69112335fe0c994002f1b32ef3aad051
Diffstat (limited to 'src/plugins/directshow/player/directshowmetadatacontrol.cpp')
| -rw-r--r-- | src/plugins/directshow/player/directshowmetadatacontrol.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/plugins/directshow/player/directshowmetadatacontrol.cpp b/src/plugins/directshow/player/directshowmetadatacontrol.cpp index 6a88d76a9..45d3a958b 100644 --- a/src/plugins/directshow/player/directshowmetadatacontrol.cpp +++ b/src/plugins/directshow/player/directshowmetadatacontrol.cpp @@ -57,11 +57,13 @@ #include "directshowmetadatacontrol.h" #include "directshowplayerservice.h" -#ifndef QT_NO_WMSDK +#include <QtMultimedia/private/qtmultimedia-config_p.h> + +#if QT_CONFIG(wmsdk) #include <wmsdk.h> #endif -#ifndef QT_NO_SHELLITEM +#if QT_CONFIG(wshellitem) #include <ShlObj.h> #include <propkeydef.h> #include <private/qsystemlibrary_p.h> @@ -108,7 +110,7 @@ typedef HRESULT (WINAPI *q_SHCreateItemFromParsingName)(PCWSTR, IBindCtx *, cons static q_SHCreateItemFromParsingName sHCreateItemFromParsingName = 0; #endif -#ifndef QT_NO_WMSDK +#if QT_CONFIG(wmsdk) namespace { @@ -290,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; @@ -390,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")); @@ -513,7 +515,7 @@ void DirectShowMetaDataControl::updateMetadata(IFilterGraph2 *graph, IBaseFilter goto send_event; #endif -#ifndef QT_NO_WMSDK +#if QT_CONFIG(wmsdk) IWMHeaderInfo *info = com_cast<IWMHeaderInfo>(source, IID_IWMHeaderInfo); if (info) { |