From a29d83ff4bbab71fc2f8af77594a9aff997c2b2a Mon Sep 17 00:00:00 2001
From: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
Date: Mon, 1 Oct 2018 15:48:41 +0200
Subject: Gstreamer: Negotiate default settings before encoding container
 profile

In case if container format, video and audio codec are not provided,
need to fetch default ones.

Change-Id: I616fabc7bf9ec7c7a08a4c5dacad87a1748209f3
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
---
 src/plugins/gstreamer/camerabin/camerabinsession.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp
index fdedc5f5a..23cbd6082 100644
--- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp
@@ -836,6 +836,8 @@ void CameraBinSession::load()
         return;
     }
 
+    m_recorderControl->applySettings();
+
 #if QT_CONFIG(gstreamer_encodingprofiles)
     GstEncodingContainerProfile *profile = m_recorderControl->videoProfile();
     if (profile) {
@@ -880,8 +882,6 @@ void CameraBinSession::start()
 
     setStatus(QCamera::StartingStatus);
 
-    m_recorderControl->applySettings();
-
     setAudioCaptureCaps();
 
     setupCaptureResolution();
-- 
cgit v1.2.3


From 4617faa7fae3deda5690dade4b64785ac215e16c Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@edeltech.ch>
Date: Thu, 21 Jun 2018 00:19:26 +0200
Subject: Migrate QGstUtils to use QRegularExpression

This patch updates the QGstUtils class to use QRegularExpression in
place of QRegExp which is to be considered deprecated.

Fixes: QTBUG-72589
Change-Id: I67e189c48688b512cc76c884fd2a7e51e1b188f9
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
---
 src/gsttools/qgstutils.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/gsttools/qgstutils.cpp b/src/gsttools/qgstutils.cpp
index 6960ff8f4..24372f7ae 100644
--- a/src/gsttools/qgstutils.cpp
+++ b/src/gsttools/qgstutils.cpp
@@ -44,6 +44,7 @@
 #include <QtCore/qdir.h>
 #include <QtCore/qbytearray.h>
 #include <QtCore/qvariant.h>
+#include <QtCore/qregularexpression.h>
 #include <QtCore/qsize.h>
 #include <QtCore/qset.h>
 #include <QtCore/qstringlist.h>
@@ -804,7 +805,7 @@ QSet<QString> QGstUtils::supportedMimeTypes(bool (*isValidFactory)(GstElementFac
                             if (value) {
                                 gchar *str = gst_value_serialize(value);
                                 QString versions = QLatin1String(str);
-                                const QStringList elements = versions.split(QRegExp(QLatin1String("\\D+")), QString::SkipEmptyParts);
+                                const QStringList elements = versions.split(QRegularExpression(QLatin1String("\\D+")), QString::SkipEmptyParts);
                                 for (const QString &e : elements)
                                     supportedMimeTypes.insert(nameLowcase + e);
                                 g_free(str);
@@ -1466,10 +1467,11 @@ QString QGstUtils::fileExtensionForMimeType(const QString &mimeType)
     if (!extension.isEmpty() || format.isEmpty())
         return extension;
 
-    QRegExp rx(QStringLiteral("[-/]([\\w]+)$"));
+    QRegularExpression rx(QStringLiteral("[-/]([\\w]+)$"));
+    QRegularExpressionMatch match = rx.match(format);
 
-    if (rx.indexIn(format) != -1)
-        extension = rx.cap(1);
+    if (match.hasMatch())
+        extension = match.captured(1);
 
     return extension;
 }
-- 
cgit v1.2.3


From 0caa716a92f8f971813fced4bd9f7d62a53cbcdb Mon Sep 17 00:00:00 2001
From: Kari Oikarinen <kari.oikarinen@qt.io>
Date: Mon, 14 Jan 2019 09:14:01 +0200
Subject: Bump version

Change-Id: Ia716cc04cebf19cc1c2514d1ab2f8b2080dd29da
---
 .qmake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.qmake.conf b/.qmake.conf
index 1c14aab6d..c954a0944 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,3 @@
 load(qt_build_config)
 
-MODULE_VERSION = 5.12.1
+MODULE_VERSION = 5.12.2
-- 
cgit v1.2.3


From 37345cd5dc75d061495888a4bb44d1329b02da8f Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer <eb@emlix.com>
Date: Fri, 11 Jan 2019 09:23:01 +0100
Subject: WavFile example: fix indentation

Change-Id: Ibc117caf24daef75cf2e71f04b058ffadd30c273
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
---
 examples/multimedia/spectrum/app/wavfile.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/multimedia/spectrum/app/wavfile.cpp b/examples/multimedia/spectrum/app/wavfile.cpp
index b0a3ffccc..d33905572 100644
--- a/examples/multimedia/spectrum/app/wavfile.cpp
+++ b/examples/multimedia/spectrum/app/wavfile.cpp
@@ -109,7 +109,7 @@ const QAudioFormat &WavFile::fileFormat() const
 
 qint64 WavFile::headerLength() const
 {
-return m_headerLength;
+    return m_headerLength;
 }
 
 bool WavFile::readHeader()
-- 
cgit v1.2.3


From 4e8e47989d96f8d60feec2187e4d9c85adb19c2a Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer <eb@emlix.com>
Date: Fri, 11 Jan 2019 09:17:52 +0100
Subject: WavFile example: drop needless includes

Change-Id: I26033a3d853dca8023fe4ec5f1eb7c53ef5d013f
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
---
 examples/multimedia/spectrum/app/wavfile.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/examples/multimedia/spectrum/app/wavfile.cpp b/examples/multimedia/spectrum/app/wavfile.cpp
index d33905572..475200db5 100644
--- a/examples/multimedia/spectrum/app/wavfile.cpp
+++ b/examples/multimedia/spectrum/app/wavfile.cpp
@@ -49,9 +49,6 @@
 ****************************************************************************/
 
 #include <qendian.h>
-#include <QVector>
-#include <QDebug>
-#include "utils.h"
 #include "wavfile.h"
 
 struct chunk
-- 
cgit v1.2.3