6 files changed, 5 insertions, 11 deletions
diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro
index 63c50f09e..2bc22e51d 100644
--- a/src/multimedia/multimedia.pro
+++ b/src/multimedia/multimedia.pro
@@ -69,7 +69,7 @@ include(video/video.pri)
 ANDROID_BUNDLED_JAR_DEPENDENCIES = \
     jar/QtMultimedia.jar:org.qtproject.qt5.android.multimedia.QtMultimediaUtils
 ANDROID_LIB_DEPENDENCIES = \
-    plugins/mediaservice/libqtmedia_android.so \
+    plugins/mediaservice/libplugins_mediaservice_qtmedia_android.so \
     lib/libQt5MultimediaQuick.so:Qt5Quick
 ANDROID_BUNDLED_FILES += \
     lib/libQt5MultimediaQuick.so
diff --git a/src/multimedia/playback/qmediaresource.cpp b/src/multimedia/playback/qmediaresource.cpp
index 181b37525..97d42bd0b 100644
--- a/src/multimedia/playback/qmediaresource.cpp
+++ b/src/multimedia/playback/qmediaresource.cpp
@@ -39,8 +39,6 @@
 
 #include "qmediaresource.h"
 
-#if QT_DEPRECATED_SINCE(6, 0)
-
 #include <QtCore/qsize.h>
 #include <QtCore/qurl.h>
 #include <QtCore/qvariant.h>
@@ -420,5 +418,3 @@ void QMediaResource::setResolution(int width, int height)
         values.remove(Resolution);
 }
 QT_END_NAMESPACE
-
-#endif // #if QT_DEPRECATED_SINCE(6, 0)
diff --git a/src/multimedia/playback/qmediaresource.h b/src/multimedia/playback/qmediaresource.h
index 8cded3128..9740166c6 100644
--- a/src/multimedia/playback/qmediaresource.h
+++ b/src/multimedia/playback/qmediaresource.h
@@ -46,8 +46,6 @@
 
 #include <QtMultimedia/qtmultimediaglobal.h>
 
-#if QT_DEPRECATED_SINCE(6, 0)
-
 QT_BEGIN_NAMESPACE
 
 // Class forward declaration required for QDoc bug
@@ -126,6 +124,4 @@ QT_END_NAMESPACE
 Q_DECLARE_METATYPE(QMediaResource)
 Q_DECLARE_METATYPE(QMediaResourceList)
 
-#endif // #if QT_DEPRECATED_SINCE(6, 0)
-
 #endif
diff --git a/src/multimedia/radio/qradiodata.cpp b/src/multimedia/radio/qradiodata.cpp
index 4c824a4f8..c795cf389 100644
--- a/src/multimedia/radio/qradiodata.cpp
+++ b/src/multimedia/radio/qradiodata.cpp
@@ -59,6 +59,7 @@ Q_CONSTRUCTOR_FUNCTION(qRegisterRadioDataMetaTypes)
 
 /*!
     \class QRadioData
+    \obsolete
     \brief The QRadioData class provides interfaces to the RDS functionality of the system radio.
 
     \inmodule QtMultimedia
diff --git a/src/multimedia/radio/qradiotuner.cpp b/src/multimedia/radio/qradiotuner.cpp
index 2af0d0f02..ea7fb35f5 100644
--- a/src/multimedia/radio/qradiotuner.cpp
+++ b/src/multimedia/radio/qradiotuner.cpp
@@ -64,6 +64,7 @@ Q_CONSTRUCTOR_FUNCTION(qRegisterRadioTunerMetaTypes)
 
 /*!
     \class QRadioTuner
+    \obsolete
     \brief The QRadioTuner class provides an interface to the systems analog radio device.
 
     \inmodule QtMultimedia
diff --git a/src/multimedia/video/qvideoframe.h b/src/multimedia/video/qvideoframe.h
index 617b0a1d9..8fcf47fc4 100644
--- a/src/multimedia/video/qvideoframe.h
+++ b/src/multimedia/video/qvideoframe.h
@@ -75,7 +75,6 @@ public:
         Format_ARGB8565_Premultiplied,
         Format_BGRA32,
         Format_BGRA32_Premultiplied,
-        Format_ABGR32,
         Format_BGR32,
         Format_BGR24,
         Format_BGR565,
@@ -102,7 +101,8 @@ public:
 
         Format_CameraRaw,
         Format_AdobeDng,
-        Format_YUV422P, // ### Qt 6: reorder
+        Format_ABGR32, // ### Qt 6: reorder
+        Format_YUV422P,
 
 #ifndef Q_QDOC
         NPixelFormats,