Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into tqtc/lts-5.15-opensourcev5.15.11-lts-lgpl

Change-Id: I3279e8339e4fadcc6d5aaafa01e4b15a92168a6c

6 files changed, 31 insertions, 10 deletions

diff --git a/.qmake.conf b/.qmake.conf
index 5e6fec742..259b036a0 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -2,4 +2,4 @@ load(qt_build_config)
 
 DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST
 
-MODULE_VERSION = 5.15.10
+MODULE_VERSION = 5.15.11
diff --git a/src/multimedia/audio/qaudiohelpers.cpp b/src/multimedia/audio/qaudiohelpers.cpp
index fae591477..1cd189d6e 100644
--- a/src/multimedia/audio/qaudiohelpers.cpp
+++ b/src/multimedia/audio/qaudiohelpers.cpp
@@ -103,19 +103,19 @@ template<class T> struct signedVersion {};
 template<> struct signedVersion<quint8>
 {
     typedef qint8 TS;
-    enum {offset = 0x80};
+    static constexpr int offset = 0x80;
 };
 
 template<> struct signedVersion<quint16>
 {
     typedef qint16 TS;
-    enum {offset = 0x8000};
+    static constexpr int offset = 0x8000;
 };
 
 template<> struct signedVersion<quint32>
 {
     typedef qint32 TS;
-    enum {offset = 0x80000000};
+    static constexpr uint offset = 0x80000000;
 };
 
 template<class T> void adjustUnsignedSamples(qreal factor, const void *src, void *dst, int samples)
diff --git a/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp b/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp
index 7cc3ad619..9b47d4650 100644
--- a/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp
+++ b/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp
@@ -302,9 +302,20 @@ void QAndroidCaptureSession::start()
         m_cameraSession->camera()->setupPreviewFrameCallback();
     }
 
+    QMediaRecorder::State oldState = m_state;
+    QMediaRecorder::Status oldStatus = m_status;
+
     m_state = QMediaRecorder::RecordingState;
-    emit stateChanged(m_state);
-    setStatus(QMediaRecorder::RecordingStatus);
+    m_status = QMediaRecorder::RecordingStatus;
+
+    m_actualOutputLocation = m_usedOutputLocation;
+    emit actualLocationChanged(m_actualOutputLocation);
+
+    if (m_state != oldState)
+        emit stateChanged(m_state);
+
+    if (m_status != oldStatus)
+        emit statusChanged(m_status);
 }
 
 void QAndroidCaptureSession::stop(bool error)
diff --git a/src/plugins/pulseaudio/qaudioinput_pulse.cpp b/src/plugins/pulseaudio/qaudioinput_pulse.cpp
index 2b5325132..b68b4af1b 100644
--- a/src/plugins/pulseaudio/qaudioinput_pulse.cpp
+++ b/src/plugins/pulseaudio/qaudioinput_pulse.cpp
@@ -402,6 +402,8 @@ int QPulseAudioInput::bytesReady() const
 
 qint64 QPulseAudioInput::read(char *data, qint64 len)
 {
+    Q_ASSERT(data != nullptr || len == 0);
+
     m_bytesAvailable = checkBytesReady();
 
     setError(QAudio::NoError);
@@ -411,7 +413,8 @@ qint64 QPulseAudioInput::read(char *data, qint64 len)
 
     if (!m_pullMode && !m_tempBuffer.isEmpty()) {
         readBytes = qMin(static_cast<int>(len), m_tempBuffer.size());
-        memcpy(data, m_tempBuffer.constData(), readBytes);
+        if (readBytes)
+            memcpy(data, m_tempBuffer.constData(), readBytes);
         m_totalTimeValue += readBytes;
 
         if (readBytes < m_tempBuffer.size()) {
@@ -502,9 +505,10 @@ qint64 QPulseAudioInput::read(char *data, qint64 len)
 
 void QPulseAudioInput::applyVolume(const void *src, void *dest, int len)
 {
+    Q_ASSERT((src && dest) || len == 0);
     if (m_volume < 1.f)
         QAudioHelperInternal::qMultiplySamples(m_volume, m_format, src, dest, len);
-    else
+    else if (len)
         memcpy(dest, src, len);
 }
 
diff --git a/src/plugins/qnx/common/windowgrabber.cpp b/src/plugins/qnx/common/windowgrabber.cpp
index 9a65ad3a0..b2470c250 100644
--- a/src/plugins/qnx/common/windowgrabber.cpp
+++ b/src/plugins/qnx/common/windowgrabber.cpp
@@ -393,8 +393,12 @@ GLuint
 WindowGrabberImage::getTexture(screen_window_t window, const QSize &size)
 {
     if (size != m_size) {
-        if (!m_glTexture)
-            glGenTextures(1, &m_glTexture);
+        // create a brand new texture to be the KHR image sibling, as
+        // previously used textures cannot be reused with new KHR image
+        // sources - note that glDeleteTextures handles nullptr gracefully
+        glDeleteTextures(1, &m_glTexture);
+        glGenTextures(1, &m_glTexture);
+
         glBindTexture(GL_TEXTURE_2D, m_glTexture);
         if (m_eglImage) {
             glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, 0);
diff --git a/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp b/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp
index e200e8d16..c44a03896 100644
--- a/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp
+++ b/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp
@@ -51,7 +51,9 @@
 
 #include <QtMultimedia/private/qtmultimediaglobal_p.h>
 #include "private/qgstvideobuffer_p.h"
+#if GST_CHECK_VERSION(1,14,0)
 #include <gst/allocators/gstphysmemory.h>
+#endif
 
 //#define QT_VIVANTE_VIDEO_DEBUG