From 9dd61fb5f5912444374450278d44e5b320e880c4 Mon Sep 17 00:00:00 2001
From: Piotr Srebrny <piotr.srebrny@qt.io>
Date: Mon, 3 Oct 2022 14:49:19 +0200
Subject: Add missing errorString function from dev
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I3c6793afa64ad3fe5f9ed16e410b5b907492a85c
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
---
 src/multimedia/windows/qwindowsmultimediautils.cpp | 8 ++++++++
 src/multimedia/windows/qwindowsmultimediautils_p.h | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/src/multimedia/windows/qwindowsmultimediautils.cpp b/src/multimedia/windows/qwindowsmultimediautils.cpp
index 205e6d4b1..50e0cf917 100644
--- a/src/multimedia/windows/qwindowsmultimediautils.cpp
+++ b/src/multimedia/windows/qwindowsmultimediautils.cpp
@@ -13,6 +13,7 @@
 #include <mfapi.h>
 #include <mfidl.h>
 #include <qwindowsmfdefs_p.h>
+#include <system_error>
 
 QT_BEGIN_NAMESPACE
 
@@ -201,4 +202,11 @@ GUID QWindowsMultimediaUtils::containerForAudioFileFormat(QMediaFormat::FileForm
     }
 }
 
+QString QWindowsMultimediaUtils::errorString(HRESULT hr)
+{
+    return QStringLiteral("%1 %2")
+            .arg(quint32(hr), 8, 16)
+            .arg(QString::fromStdString(std::system_category().message(hr)));
+}
+
 QT_END_NAMESPACE
diff --git a/src/multimedia/windows/qwindowsmultimediautils_p.h b/src/multimedia/windows/qwindowsmultimediautils_p.h
index eba614075..58ecd425f 100644
--- a/src/multimedia/windows/qwindowsmultimediautils_p.h
+++ b/src/multimedia/windows/qwindowsmultimediautils_p.h
@@ -19,6 +19,7 @@
 #include <private/qplatformmediaformatinfo_p.h>
 #include <qvideoframeformat.h>
 #include <guiddef.h>
+#include <qstring.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -37,6 +38,8 @@ namespace QWindowsMultimediaUtils {
     Q_MULTIMEDIA_EXPORT GUID containerForVideoFileFormat(QMediaFormat::FileFormat format);
 
     Q_MULTIMEDIA_EXPORT GUID containerForAudioFileFormat(QMediaFormat::FileFormat format);
+
+    Q_MULTIMEDIA_EXPORT QString errorString(HRESULT hr);
 }
 
 QT_END_NAMESPACE
-- 
cgit v1.2.1