From a7f01cea43a16a9b2b06ab3a8ff3b62b8edce5cd Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@qt.io>
Date: Sun, 3 Feb 2019 13:01:19 +0100
Subject: Fix static build on Windows

Fixes: QTBUG-73464
Change-Id: I5d1052dec14bbe6ee69b348352991d14d63b9c76
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
---
 src/multimediawidgets/qvideowidget.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/multimediawidgets/qvideowidget.cpp b/src/multimediawidgets/qvideowidget.cpp
index ab552b90d..ad72eae6a 100644
--- a/src/multimediawidgets/qvideowidget.cpp
+++ b/src/multimediawidgets/qvideowidget.cpp
@@ -57,6 +57,10 @@
 #include <qwindow.h>
 #include <private/qhighdpiscaling_p.h>
 
+#ifdef Q_OS_WIN
+#include <QtCore/qt_windows.h>
+#endif
+
 using namespace Qt;
 
 QT_BEGIN_NAMESPACE
-- 
cgit v1.2.1


From 4e47d0a710452cfba62a8a3c2c2ce5c118bc00fe Mon Sep 17 00:00:00 2001
From: Val Doroshchuk <valentyn.doroshchuk@qt.io>
Date: Mon, 11 Feb 2019 11:40:22 +0100
Subject: Gstreamer: Fix compilation error with 0.10 version

Task-number: QTBUG-73740
Change-Id: I1de087b63f65bab39351d5446254a8d1832e88c3
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
---
 src/gsttools/qgstutils.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/gsttools/qgstutils.cpp b/src/gsttools/qgstutils.cpp
index 24372f7ae..58dd6e5fe 100644
--- a/src/gsttools/qgstutils.cpp
+++ b/src/gsttools/qgstutils.cpp
@@ -1309,8 +1309,7 @@ void QGstUtils::setMetaData(GstBin *bin, const QMap<QByteArray, QVariant> &data)
 
 GstCaps *QGstUtils::videoFilterCaps()
 {
-    static GstStaticCaps staticCaps = {
-        NULL,
+    const char *caps =
 #if GST_CHECK_VERSION(1,2,0)
         "video/x-raw(ANY);"
 #elif GST_CHECK_VERSION(1,0,0)
@@ -1322,9 +1321,8 @@ GstCaps *QGstUtils::videoFilterCaps()
         "video/x-android-buffer;"
 #endif
         "image/jpeg;"
-        "video/x-h264",
-        GST_PADDING_INIT
-    };
+        "video/x-h264";
+    static GstStaticCaps staticCaps = GST_STATIC_CAPS(caps);
 
     return gst_caps_make_writable(gst_static_caps_get(&staticCaps));
 }
-- 
cgit v1.2.1