97 lines
3.2 KiB
Diff
97 lines
3.2 KiB
Diff
From b94e25c8537fc12cb162dd7b5cac3bd43908c1d9 Mon Sep 17 00:00:00 2001
|
|
From: Martchus <martchus@gmx.net>
|
|
Date: Sun, 29 Dec 2019 00:39:46 +0100
|
|
Subject: [PATCH 4/4] Fix case of header file for building with mingw-w64
|
|
|
|
Change-Id: Ie0e6599234c38c5e5a75b681a911f3728871861e
|
|
---
|
|
config.tests/wshellitem/main.cpp | 2 +-
|
|
src/plugins/directshow/player/directshowmetadatacontrol.cpp | 2 +-
|
|
src/plugins/winrt/qwinrtcameracontrol.cpp | 2 +-
|
|
src/plugins/wmf/player/mfplayersession.cpp | 2 +-
|
|
src/plugins/wmf/player/mftvideo.cpp | 2 +-
|
|
src/plugins/wmf/sourceresolver.cpp | 2 +-
|
|
6 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/config.tests/wshellitem/main.cpp b/config.tests/wshellitem/main.cpp
|
|
index 799ee555..459992b7 100644
|
|
--- a/config.tests/wshellitem/main.cpp
|
|
+++ b/config.tests/wshellitem/main.cpp
|
|
@@ -26,7 +26,7 @@
|
|
**
|
|
****************************************************************************/
|
|
|
|
-#include <ShlObj.h>
|
|
+#include <shlobj.h>
|
|
|
|
int main(int, char**)
|
|
{
|
|
diff --git a/src/plugins/directshow/player/directshowmetadatacontrol.cpp b/src/plugins/directshow/player/directshowmetadatacontrol.cpp
|
|
index 46674143..d9864870 100644
|
|
--- a/src/plugins/directshow/player/directshowmetadatacontrol.cpp
|
|
+++ b/src/plugins/directshow/player/directshowmetadatacontrol.cpp
|
|
@@ -64,7 +64,7 @@
|
|
#endif
|
|
|
|
#if QT_CONFIG(wshellitem)
|
|
-#include <ShlObj.h>
|
|
+#include <shlobj.h>
|
|
#include <propkeydef.h>
|
|
#include <private/qsystemlibrary_p.h>
|
|
|
|
diff --git a/src/plugins/winrt/qwinrtcameracontrol.cpp b/src/plugins/winrt/qwinrtcameracontrol.cpp
|
|
index ede3f6b0..98dd7c2f 100644
|
|
--- a/src/plugins/winrt/qwinrtcameracontrol.cpp
|
|
+++ b/src/plugins/winrt/qwinrtcameracontrol.cpp
|
|
@@ -54,7 +54,7 @@
|
|
|
|
#include <functional>
|
|
#include <mfapi.h>
|
|
-#include <Mferror.h>
|
|
+#include <mferror.h>
|
|
#include <mfidl.h>
|
|
#include <wrl.h>
|
|
#include <windows.devices.enumeration.h>
|
|
diff --git a/src/plugins/wmf/player/mfplayersession.cpp b/src/plugins/wmf/player/mfplayersession.cpp
|
|
index 10ba2599..a4e37129 100644
|
|
--- a/src/plugins/wmf/player/mfplayersession.cpp
|
|
+++ b/src/plugins/wmf/player/mfplayersession.cpp
|
|
@@ -56,7 +56,7 @@
|
|
#include "mfplayersession.h"
|
|
#include "mfplayerservice.h"
|
|
#include "mfmetadatacontrol.h"
|
|
-#include <Mferror.h>
|
|
+#include <mferror.h>
|
|
#include <nserror.h>
|
|
#include "sourceresolver.h"
|
|
#include "samplegrabber.h"
|
|
diff --git a/src/plugins/wmf/player/mftvideo.cpp b/src/plugins/wmf/player/mftvideo.cpp
|
|
index 879911d5..9dce654f 100644
|
|
--- a/src/plugins/wmf/player/mftvideo.cpp
|
|
+++ b/src/plugins/wmf/player/mftvideo.cpp
|
|
@@ -40,7 +40,7 @@
|
|
#include "mftvideo.h"
|
|
#include "mfvideoprobecontrol.h"
|
|
#include <private/qmemoryvideobuffer_p.h>
|
|
-#include <Mferror.h>
|
|
+#include <mferror.h>
|
|
#include <strmif.h>
|
|
#include <uuids.h>
|
|
#include <InitGuid.h>
|
|
diff --git a/src/plugins/wmf/sourceresolver.cpp b/src/plugins/wmf/sourceresolver.cpp
|
|
index c6f4e856..15ef6f0a 100644
|
|
--- a/src/plugins/wmf/sourceresolver.cpp
|
|
+++ b/src/plugins/wmf/sourceresolver.cpp
|
|
@@ -39,7 +39,7 @@
|
|
|
|
#include "mfstream.h"
|
|
#include "sourceresolver.h"
|
|
-#include <Mferror.h>
|
|
+#include <mferror.h>
|
|
#include <nserror.h>
|
|
#include <QtCore/qfile.h>
|
|
#include <QtCore/qdebug.h>
|
|
--
|
|
2.24.1
|
|
|