10 files changed, 36 insertions, 13 deletions
diff --git a/src/imports/audioengine/audioengine.cpp b/src/imports/audioengine/audioengine.cpp
index 537b09ab8..698f41bdc 100644
--- a/src/imports/audioengine/audioengine.cpp
+++ b/src/imports/audioengine/audioengine.cpp
@@ -80,7 +80,9 @@ public:
         qmlRegisterType<QDeclarativeAudioEngine, 1>(uri, 1, 1, "AudioEngine");
         qmlRegisterType<QDeclarativeSound, 1>(uri, 1, 1, "Sound");
 
-        qmlRegisterModule(uri, 1, QT_VERSION_MINOR);
+        // The minor version used to be the current Qt 5 minor. For compatibility it is the last
+        // Qt 5 release.
+        qmlRegisterModule(uri, 1, 15);
     }
 };
 
diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp
index 8aed83d33..5e3071f2b 100644
--- a/src/imports/multimedia/multimedia.cpp
+++ b/src/imports/multimedia/multimedia.cpp
@@ -160,8 +160,9 @@ public:
         // 5.13 types
         qmlRegisterType<QDeclarativeVideoOutput, 13>(uri, 5, 13, "VideoOutput");
 
-        // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.11 onward
-        qmlRegisterModule(uri, 5, QT_VERSION_MINOR);
+        // The minor version used to be the current Qt 5 minor. For compatibility it is the last
+        // Qt 5 release.
+        qmlRegisterModule(uri, 5, 15);
     }
 
     void initializeEngine(QQmlEngine *engine, const char *uri) override
diff --git a/src/plugins/coreaudio/coreaudiodeviceinfo.mm b/src/plugins/coreaudio/coreaudiodeviceinfo.mm
index 1a79438cb..594ea225b 100644
--- a/src/plugins/coreaudio/coreaudiodeviceinfo.mm
+++ b/src/plugins/coreaudio/coreaudiodeviceinfo.mm
@@ -189,7 +189,7 @@ QList<int> CoreAudioDeviceInfo::supportedSampleRates()
     //with available hardware
     sampleRates << 8000 << 11025 << 22050 << 44100 << 48000;
 #endif
-    return sampleRates.toList();
+    return sampleRates.values();
 }
 
 
diff --git a/src/plugins/m3u/qm3uhandler.cpp b/src/plugins/m3u/qm3uhandler.cpp
index 017c32d92..5e05994ef 100644
--- a/src/plugins/m3u/qm3uhandler.cpp
+++ b/src/plugins/m3u/qm3uhandler.cpp
@@ -163,7 +163,7 @@ public:
 
     virtual bool writeItem(const QMediaContent& item)
     {
-        *m_textStream << item.request().url().toString() << endl;
+        *m_textStream << item.request().url().toString() << Qt::endl;
         return true;
     }
 
diff --git a/src/plugins/qnx/camera/bbcameraorientationhandler.cpp b/src/plugins/qnx/camera/bbcameraorientationhandler.cpp
index eee0f2581..a4c7b43ba 100644
--- a/src/plugins/qnx/camera/bbcameraorientationhandler.cpp
+++ b/src/plugins/qnx/camera/bbcameraorientationhandler.cpp
@@ -76,7 +76,11 @@ BbCameraOrientationHandler::~BbCameraOrientationHandler()
     QCoreApplication::eventDispatcher()->removeNativeEventFilter(this);
 }
 
-bool BbCameraOrientationHandler::nativeEventFilter(const QByteArray&, void *message, long*)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+bool BbCameraOrientationHandler::nativeEventFilter(const QByteArray&, void *message, qintptr *)
+#else
+bool BbCameraOrientationHandler::nativeEventFilter(const QByteArray&, void *message, long *)
+#endif
 {
     bps_event_t* const event = static_cast<bps_event_t*>(message);
     if (!event || bps_event_get_domain(event) != orientation_get_domain())
diff --git a/src/plugins/qnx/camera/bbcameraorientationhandler.h b/src/plugins/qnx/camera/bbcameraorientationhandler.h
index 006a259cc..a98582d84 100644
--- a/src/plugins/qnx/camera/bbcameraorientationhandler.h
+++ b/src/plugins/qnx/camera/bbcameraorientationhandler.h
@@ -51,7 +51,11 @@ public:
     explicit BbCameraOrientationHandler(QObject *parent = 0);
     ~BbCameraOrientationHandler();
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override;
+#else
     bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override;
+#endif
 
     int orientation() const;
 
diff --git a/src/plugins/qnx/common/windowgrabber.cpp b/src/plugins/qnx/common/windowgrabber.cpp
index 9a65ad3a0..f431f98a2 100644
--- a/src/plugins/qnx/common/windowgrabber.cpp
+++ b/src/plugins/qnx/common/windowgrabber.cpp
@@ -189,7 +189,11 @@ bool WindowGrabber::handleScreenEvent(screen_event_t screen_event)
     return false;
 }
 
-bool WindowGrabber::nativeEventFilter(const QByteArray &eventType, void *message, long*)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+bool WindowGrabber::nativeEventFilter(const QByteArray &eventType, void *message, qintptr *)
+#else
+bool WindowGrabber::nativeEventFilter(const QByteArray &eventType, void *message, long *)
+#endif
 {
     if (eventType == "screen_event_t") {
         const screen_event_t event = static_cast<screen_event_t>(message);
diff --git a/src/plugins/qnx/common/windowgrabber.h b/src/plugins/qnx/common/windowgrabber.h
index 3ebd0e8a6..5603d9634 100644
--- a/src/plugins/qnx/common/windowgrabber.h
+++ b/src/plugins/qnx/common/windowgrabber.h
@@ -100,7 +100,11 @@ public:
     void pause();
     void resume();
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override;
+#else
     bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override;
+#endif
 
     bool handleScreenEvent(screen_event_t event);
 
diff --git a/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.cpp b/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.cpp
index c050c03c5..29fd082d8 100644
--- a/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.cpp
+++ b/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.cpp
@@ -113,9 +113,11 @@ void MmrEventMediaPlayerControl::resetMonitoring()
     m_speed = 0;
 }
 
-bool MmrEventMediaPlayerControl::nativeEventFilter(const QByteArray &eventType,
-                                                   void *message,
-                                                   long *result)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+bool MmrEventMediaPlayerControl::nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result)
+#else
+bool MmrEventMediaPlayerControl::nativeEventFilter(const QByteArray &eventType, void *message, long *result)
+#endif
 {
     Q_UNUSED(result)
     if (eventType == "screen_event_t") {
diff --git a/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.h b/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.h
index 0e4defc5c..cb80ccbfc 100644
--- a/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.h
+++ b/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.h
@@ -58,9 +58,11 @@ public:
     void stopMonitoring() override;
     void resetMonitoring() override;
 
-    bool nativeEventFilter(const QByteArray &eventType,
-                           void *message,
-                           long *result) override;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override;
+#else
+    bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override;
+#endif
 
 private Q_SLOTS:
     void readEvents();