4 files changed, 11 insertions, 5 deletions
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/multimedia/audio/qsoundeffect_pulse_p.cpp b/src/multimedia/audio/qsoundeffect_pulse_p.cpp
index 51cdde026..a141f7e36 100644
--- a/src/multimedia/audio/qsoundeffect_pulse_p.cpp
+++ b/src/multimedia/audio/qsoundeffect_pulse_p.cpp
@@ -552,8 +552,10 @@ void QSoundEffectPrivate::setVolume(qreal volume)
 
     m_volume = qBound(qreal(0), volume, qreal(1));
     locker.unlock();
-    if (!m_playing && m_pulseStream)
+    if (!m_playing && m_pulseStream) {
+        PulseDaemonLocker locker;
         pa_stream_flush(m_pulseStream, volume_stream_flush_callback, m_ref->getRef());
+    }
     emit volumeChanged();
 }
 
diff --git a/src/multimedia/video/qabstractvideobuffer.cpp b/src/multimedia/video/qabstractvideobuffer.cpp
index f0dd6d2eb..8762150d0 100644
--- a/src/multimedia/video/qabstractvideobuffer.cpp
+++ b/src/multimedia/video/qabstractvideobuffer.cpp
@@ -96,12 +96,15 @@ int QAbstractVideoBufferPrivate::map(
     Identifies the type of a video buffers handle.
 
     \value NoHandle The buffer has no handle, its data can only be accessed by mapping the buffer.
-    \value GLTextureHandle The handle of the buffer is an OpenGL texture ID.
+    \value GLTextureHandle The handle of the buffer is an OpenGL texture ID
+           of an undefined and platform dependent target type.
     \value XvShmImageHandle The handle contains pointer to shared memory XVideo image.
     \value CoreImageHandle The handle contains pointer to \macos CIImage.
     \value QPixmapHandle The handle of the buffer is a QPixmap.
     \value EGLImageHandle The handle of the buffer is an EGLImageKHR.
     \value UserHandle Start value for user defined handle types.
+    \value GLTextureRectangleHandle The handle of the buffer is an OpenGL texture ID
+           of target type \c GL_TEXTURE_RECTANGLE.
 
     \sa handleType()
 */
diff --git a/src/multimedia/video/qabstractvideobuffer.h b/src/multimedia/video/qabstractvideobuffer.h
index 2352c0f3d..a3afc18e4 100644
--- a/src/multimedia/video/qabstractvideobuffer.h
+++ b/src/multimedia/video/qabstractvideobuffer.h
@@ -64,6 +64,7 @@ public:
         CoreImageHandle,
         QPixmapHandle,
         EGLImageHandle,
+        GLTextureRectangleHandle,
         UserHandle = 1000
     };