Fixup build with qt > 5.14

sailfishos · Dec 22, 2022 · f76b74f · f76b74f
1 parent 43ec16f
commit f76b74f
Show file tree

Hide file tree

Showing 13 changed files with 187 additions and 84 deletions.
diff --git a/common.pri b/common.pri
@@ -2,8 +2,8 @@ LIBDBUSQEVENTLOOP = $${PWD}/libdbus-qeventloop
 LIBRESOURCEQT = $${PWD}/libresourceqt
 LIBMEDIAOVERRIDESQT = $${PWD}/libmediaoverridesqt
 
-RESOURCEQTLIB = -L$${LIBRESOURCEQT}/build -lresourceqt5
-DBUSQEVENTLOOPLIB = -L$${LIBDBUSQEVENTLOOP}/build -ldbus-qeventloop-qt5
+RESOURCEQTLIB = -L$${LIBRESOURCEQT}/build -lresourceqt$${QT_MAJOR_VERSION}
+DBUSQEVENTLOOPLIB = -L$${LIBDBUSQEVENTLOOP}/build -ldbus-qeventloop-qt$${QT_MAJOR_VERSION}
 
 PUBLIC_INCLUDE = $${LIBRESOURCEQT}/include/
 
diff --git a/libdbus-qeventloop/dbusconnectioneventloop.cpp b/libdbus-qeventloop/dbusconnectioneventloop.cpp
@@ -149,7 +149,7 @@ dbus_bool_t DBUSConnectionEventLoop::addWatch(DBusWatch *watch, void *data)
         loop->connect(watcher.write, SIGNAL(activated(int)), SLOT(writeSocket(int)));
     }
 
-    loop->watchers.insertMulti(fd, watcher);
+    loop->watchers.insert(fd, watcher);
 
     return true;
 }

diff --git a/libdbus-qeventloop/libdbus-qeventloop.pro b/libdbus-qeventloop/libdbus-qeventloop.pro
@@ -20,7 +20,7 @@
 ##############################################################################
 
 include(../common.pri)
-TARGET = dbus-qeventloop-qt5
+TARGET = dbus-qeventloop-qt$${QT_MAJOR_VERSION}
 TEMPLATE    = lib
 DESTDIR     = build
 MOC_DIR     = .moc
@@ -42,14 +42,14 @@ INSTALLBASE    = $$[QT_INSTALL_PREFIX]
 target.path    = $$[QT_INSTALL_LIBS]
 headers.path   = $$INSTALLBASE/include
 
-QMAKE_PKGCONFIG_NAME = libdbus-qeventloop5
+QMAKE_PKGCONFIG_NAME = libdbus-qeventloop$${QT_MAJOR_VERSION}
 QMAKE_PKGCONFIG_DESCRIPTION = D-Bus - QEventloop binding
 QMAKE_PKGCONFIG_LIBDIR = $$target.path
 QMAKE_PKGCONFIG_INCDIR = $$headers.path
 QMAKE_PKGCONFIG_DESTDIR = pkgconfig
 QMAKE_PKGCONFIG_REQUIRES = dbus-1
 QMAKE_PKGCONFIG_VERSION = $$VERSION
-QMAKE_PKGCONFIG_FILE = libdbus-qeventloop5
+QMAKE_PKGCONFIG_FILE = libdbus-qeventloop$${QT_MAJOR_VERSION}
 
 INSTALLS       = target headers
 
diff --git a/libmediaoverridesqt/libmediaoverridesqt.pro b/libmediaoverridesqt/libmediaoverridesqt.pro
@@ -1,6 +1,6 @@
 include(../common.pri)
 TEMPLATE = lib
-TARGET = mediaoverridesqt5
+TARGET = mediaoverridesqt$${QT_MAJOR_VERSION}
 DESTDIR = build
 DEPENDPATH += .
 INCLUDEPATH += .
@@ -28,16 +28,16 @@ QMAKE_DISTCLEAN += -r moc build
 headers.files  = $${PUBLIC_HEADERS}
 INSTALLBASE    = $$[QT_INSTALL_PREFIX]
 target.path    = $$[QT_INSTALL_LIBS]
-headers.path   = $${INSTALLBASE}/include/resource/qt5/policy
+headers.path   = $${INSTALLBASE}/include/resource/qt$${QT_MAJOR_VERSION}/policy
 
-QMAKE_PKGCONFIG_NAME = libmediaoverridesqt5
+QMAKE_PKGCONFIG_NAME = libmediaoverridesqt$${QT_MAJOR_VERSION}
 QMAKE_PKGCONFIG_DESCRIPTION = Maemo playback manager Qt API
 QMAKE_PKGCONFIG_LIBDIR = $$target.path
-QMAKE_PKGCONFIG_INCDIR = $${INSTALLBASE}/include/resource/qt5
+QMAKE_PKGCONFIG_INCDIR = $${INSTALLBASE}/include/resource/qt$${QT_MAJOR_VERSION}
 QMAKE_PKGCONFIG_DESTDIR = pkgconfig
-QMAKE_PKGCONFIG_REQUIRES = Qt5DBus
+QMAKE_PKGCONFIG_REQUIRES = Qt$${QT_MAJOR_VERSION}DBus
 QMAKE_PKGCONFIG_VERSION = $$VERSION
-QMAKE_PKGCONFIG_FILE = libmediaoverridesqt5
+QMAKE_PKGCONFIG_FILE = libmediaoverridesqt$${QT_MAJOR_VERSION}
 
 INSTALLS       = target headers
 
diff --git a/libresourceqt/include/policy/resource-set.h b/libresourceqt/include/policy/resource-set.h
@@ -59,6 +59,10 @@ USA.
 #include <stdarg.h>
 #include <stdio.h>
 
+#if (QT_VERSION > QT_VERSION_CHECK(6,0,0))
+#include <QRecursiveMutex>
+#endif
+
 class ResourceSetPrivate;
 
 
@@ -414,7 +418,11 @@ class ResourceSet: public QObject
     bool haveAudioProperties;
     bool inAcquireMode;
     QList<requestType> requestQ;
+#if (QT_VERSION > QT_VERSION_CHECK(6,0,0))
+    QRecursiveMutex reqMutex;
+#else
     QMutex reqMutex;
+#endif
     bool ignoreQ;
     ResourceSetPrivate* d;
     bool initialize();

diff --git a/libresourceqt/libresourceqt.pro b/libresourceqt/libresourceqt.pro
@@ -21,7 +21,7 @@
 
 include(../common.pri)
 TEMPLATE = lib
-TARGET = resourceqt5
+TARGET = resourceqt$${QT_MAJOR_VERSION}
 DESTDIR = build
 DEPENDPATH += $${POLICY} src
 INCLUDEPATH += $${PUBLIC_INCLUDE} $${LIBDBUSQEVENTLOOP} src
@@ -55,23 +55,23 @@ PKGCONFIG += dbus-1 libresource
 headers.files  = $${PUBLIC_HEADERS}
 INSTALLBASE    = $$[QT_INSTALL_PREFIX]
 target.path    = $$[QT_INSTALL_LIBS]
-headers.path   = $${INSTALLBASE}/include/resource/qt5/policy
+headers.path   = $${INSTALLBASE}/include/resource/qt$${QT_MAJOR_VERSION}/policy
 
 man.files      = docs/man
 man.path       = $${INSTALLBASE}/share
 htmldoc.files   = docs/html
-htmldoc.path   = $${INSTALLBASE}/share/doc/libresourceqt5
+htmldoc.path   = $${INSTALLBASE}/share/doc/libresourceqt$${QT_MAJOR_VERSION}
 xmldoc.files    = docs/xml
-xmldoc.path    = $${INSTALLBASE}/share/doc/libresourceqt5
+xmldoc.path    = $${INSTALLBASE}/share/doc/libresourceqt$${QT_MAJOR_VERSION}
 
-QMAKE_PKGCONFIG_NAME = libresourceqt5
+QMAKE_PKGCONFIG_NAME = libresourceqt$${QT_MAJOR_VERSION}
 QMAKE_PKGCONFIG_DESCRIPTION = Maemo resource management Qt API
 QMAKE_PKGCONFIG_LIBDIR = $$target.path
-QMAKE_PKGCONFIG_INCDIR = $${INSTALLBASE}/include/resource/qt5
+QMAKE_PKGCONFIG_INCDIR = $${INSTALLBASE}/include/resource/qt$${QT_MAJOR_VERSION}
 QMAKE_PKGCONFIG_DESTDIR = pkgconfig
-QMAKE_PKGCONFIG_REQUIRES = dbus-1 libdbus-qeventloop5 libresource Qt5Core
+QMAKE_PKGCONFIG_REQUIRES = dbus-1 libdbus-qeventloop$${QT_MAJOR_VERSION} libresource Qt$${QT_MAJOR_VERSION}Core
 QMAKE_PKGCONFIG_VERSION = $$VERSION
-QMAKE_PKGCONFIG_FILE = libresourceqt5
+QMAKE_PKGCONFIG_FILE = libresourceqt$${QT_MAJOR_VERSION}
 
 INSTALLS       = target headers man htmldoc xmldoc
 
diff --git a/libresourceqt/src/resource-engine.cpp b/libresourceqt/src/resource-engine.cpp
@@ -23,6 +23,10 @@ USA.
 #include <dbus/dbus.h>
 #include <res-msg.h>
 
+#if (QT_VERSION > QT_VERSION_CHECK(6,0,0))
+#include <QRecursiveMutex>
+#endif
+
 Q_LOGGING_CATEGORY(lcResourceQt, "resourceQt", QtWarningMsg)
 
 using namespace ResourcePolicy;
@@ -32,7 +36,11 @@ static QMultiMap<resconn_t *, ResourceEngine *> engineMap;
 resconn_t *ResourceEngine::libresourceConnection = NULL;
 quint32 ResourceEngine::libresourceUsers = 0;
 
+#if (QT_VERSION > QT_VERSION_CHECK(6,0,0))
+static QRecursiveMutex mutex;
+#else
 static QMutex mutex(QMutex::Recursive);
+#endif
 
 static inline quint32 allResourcesToBitmask(const ResourceSet *resourceSet);
 static inline quint32 optionalResourcesToBitmask(const ResourceSet *resourceSet);
@@ -61,7 +69,11 @@ ResourceEngine::ResourceEngine(ResourceSet *resourceSet)
 ResourceEngine::~ResourceEngine()
 {
     qCDebug(lcResourceQt, "ResourceEngine(%d)::%s() - **************** locking....", identifier, __FUNCTION__);
+#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
     QMutexLocker locker(&mutex);
+#else
+    mutex.unlock();
+#endif
     qCDebug(lcResourceQt, "ResourceEngine::~ResourceEngine(%d) - starting destruction", identifier);
     libresourceUsers--;
 
@@ -83,7 +95,11 @@ ResourceEngine::~ResourceEngine()
 bool ResourceEngine::initialize()
 {
     qCDebug(lcResourceQt, "ResourceEngine(%d)::%s() - **************** locking....", identifier, __FUNCTION__);
+#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
     QMutexLocker locker(&mutex);
+#else
+    mutex.lock();
+#endif
     DBusError dbusError;
     DBusConnection *dbusConnection;
 
@@ -124,7 +140,11 @@ bool ResourceEngine::initialize()
 static void handleUnregisterMessage(resmsg_t *message, resset_t *libresourceSet, void *)
 {
     qCDebug(lcResourceQt, "**************** %s() - locking....", __FUNCTION__);
+#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
     QMutexLocker locker(&mutex);
+#else
+    mutex.lock();
+#endif
     if (NULL == libresourceSet->userdata) {
         qCDebug(lcResourceQt) << QString("IGNORING unregister, no context");
         return;
@@ -151,7 +171,11 @@ void ResourceEngine::disconnected()
 static void handleGrantMessage(resmsg_t *message, resset_t *libresourceSet, void *)
 {
     qCDebug(lcResourceQt, "**************** %s() - locking....", __FUNCTION__);
+#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
     QMutexLocker locker(&mutex);
+#else
+    mutex.lock();
+#endif
     if (NULL == libresourceSet->userdata) {
         qCDebug(lcResourceQt, "IGNORING grant, no context: type=0x%04x, id=0x%04x, reqno=0x%04x, resc=0x%04x",
                 message->notify.type, message->notify.id, message->notify.reqno, message->notify.resrc);
@@ -224,7 +248,11 @@ void ResourceEngine::receivedGrant(resmsg_notify_t *notifyMessage)
 static void handleReleaseMessage(resmsg_t *message, resset_t *rs, void *)
 {
     qCDebug(lcResourceQt, "**************** %s() - locking....", __FUNCTION__);
+#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
     QMutexLocker locker(&mutex);
+#else
+    mutex.lock();
+#endif
     if (NULL == rs->userdata) {
         qCDebug(lcResourceQt) << QString("IGNORING release, no context");
         return;
@@ -253,7 +281,11 @@ void ResourceEngine::receivedRelease(resmsg_notify_t *message)
 static void handleAdviceMessage(resmsg_t *message, resset_t *libresourceSet, void *)
 {
     qCDebug(lcResourceQt, "**************** %s() - locking....", __FUNCTION__);
+#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
     QMutexLocker locker(&mutex);
+#else
+    mutex.lock();
+#endif
     if (NULL == libresourceSet->userdata) {
         qCDebug(lcResourceQt) << QString("IGNORING advice, no context");
         return;
@@ -282,7 +314,11 @@ void ResourceEngine::receivedAdvice(resmsg_notify_t *message)
 bool ResourceEngine::connectToManager()
 {
     qCDebug(lcResourceQt, "ResourceEngine(%d)::%s() - **************** locking....", identifier, __FUNCTION__);
+#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
     QMutexLocker locker(&mutex);
+#else
+    mutex.lock();
+#endif
     if (isConnecting) {
         qCDebug(lcResourceQt, "ResourceEngine::%s().... allready connecting, ignoring request", __FUNCTION__);
         return true;
@@ -327,7 +363,11 @@ bool ResourceEngine::connectToManager()
 bool ResourceEngine::disconnectFromManager()
 {
     qCDebug(lcResourceQt, "ResourceEngine(%d)::%s() - **************** locking....", identifier, __FUNCTION__);
+#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
     QMutexLocker locker(&mutex);
+#else
+    mutex.lock();
+#endif
     resmsg_t resourceMessage;
     memset(&resourceMessage, 0, sizeof(resmsg_t));
 
@@ -419,7 +459,11 @@ static inline quint32 optionalResourcesToBitmask(const ResourceSet *resourceSet)
 static void statusCallbackHandler(resset_t *libresourceSet, resmsg_t *message)
 {
     qCDebug(lcResourceQt, "**************** %s().... %d", __FUNCTION__, __LINE__);
+#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
     QMutexLocker locker(&mutex);
+#else
+    mutex.lock();
+#endif
     if (NULL == libresourceSet->userdata) {
         qCDebug(lcResourceQt, "IGNORING status message, no context: type=0x%04x, id=0x%04x, reqno=0x%04x, errcod=%d",
                 message->status.type, message->status.id, message->status.reqno, message->status.errcod);
@@ -519,7 +563,11 @@ bool ResourceEngine::isConnectingToManager()
 bool ResourceEngine::acquireResources()
 {
     qCDebug(lcResourceQt, "ResourceEngine(%d)::%s() - **************** locking....", identifier, __FUNCTION__);
+#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
     QMutexLocker locker(&mutex);
+#else
+    mutex.lock();
+#endif
     resmsg_t message;
     memset(&message, 0, sizeof(resmsg_t));
 
@@ -538,7 +586,11 @@ bool ResourceEngine::acquireResources()
 bool ResourceEngine::releaseResources()
 {
     qCDebug(lcResourceQt, "ResourceEngine(%d)::%s() - **************** locking....", identifier, __FUNCTION__);
+#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
     QMutexLocker locker(&mutex);
+#else
+    mutex.lock();
+#endif
     resmsg_t message;
     memset(&message, 0, sizeof(resmsg_t));
 
@@ -556,7 +608,11 @@ bool ResourceEngine::releaseResources()
 bool ResourceEngine::updateResources()
 {
     qCDebug(lcResourceQt, "ResourceEngine(%d)::%s() - **************** locking....", identifier, __FUNCTION__);
+#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
     QMutexLocker locker(&mutex);
+#else
+    mutex.lock();
+#endif
     resmsg_t message;
     memset(&message, 0, sizeof(resmsg_t));
     message.record.type = RESMSG_UPDATE;
@@ -591,7 +647,11 @@ bool ResourceEngine::registerAudioProperties(const QString &audioGroup, quint32
                                              const QString &name, const QString &value)
 {
     qCDebug(lcResourceQt, "ResourceEngine(%d)::%s() - **************** locking....", identifier, __FUNCTION__);
+#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
     QMutexLocker locker(&mutex);
+#else
+    mutex.lock();
+#endif
     resmsg_t message;
     memset(&message, 0, sizeof(resmsg_t));
     QByteArray groupBa, nameBa, valueBa;
@@ -633,7 +693,11 @@ bool ResourceEngine::registerAudioProperties(const QString &audioGroup, quint32
 bool ResourceEngine::registerVideoProperties(quint32 pid)
 {
     qCDebug(lcResourceQt, "ResourceEngine(%d)::%s() - **************** locking....", identifier, __FUNCTION__);
+#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
     QMutexLocker locker(&mutex);
+#else
+    mutex.lock();
+#endif
     resmsg_t message;
     memset(&message, 0, sizeof(resmsg_t));
 
@@ -660,7 +724,11 @@ bool ResourceEngine::registerVideoProperties(quint32 pid)
 static void connectionIsUp(resconn_t *connection)
 {
     qCDebug(lcResourceQt, "**************** %s() - locking....", __FUNCTION__);
+#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
     QMutexLocker locker(&mutex);
+#else
+    mutex.lock();
+#endif
 
     qCDebug(lcResourceQt) << QString("connection is up");
 

diff --git a/libresourceqt/src/resource-set.cpp b/libresourceqt/src/resource-set.cpp
@@ -20,6 +20,7 @@ USA.
 *************************************************************************/
 #include <policy/resource-set.h>
 #include "resource-engine.h"
+
 using namespace ResourcePolicy;
 
 static quint32 resourceSetId=1;
@@ -35,7 +36,11 @@ ResourceSet::ResourceSet(const QString &applicationClass, QObject * parent,
       audioResource(NULL), autoRelease(initialAutoRelease),
       alwaysReply(initialAlwaysReply), initialized(false), pendingAcquire(false),
       pendingUpdate(false), pendingAudioProperties(false), pendingVideoProperties(false),
+#if (QT_VERSION > QT_VERSION_CHECK(6,0,0))
+      inAcquireMode(false), reqMutex(QRecursiveMutex()), ignoreQ(false)
+#else
       inAcquireMode(false), reqMutex(QMutex::Recursive), ignoreQ(false)
+#endif
 {
     identifier = resourceSetId++;
     memset(resourceSet, 0, sizeof(Resource *)*NumberOfTypes);
@@ -46,7 +51,11 @@ ResourceSet::ResourceSet(const QString &applicationClass, QObject * parent)
       audioResource(NULL), autoRelease(false),
       alwaysReply(false), initialized(false), pendingAcquire(false),
       pendingUpdate(false), pendingAudioProperties(false), pendingVideoProperties(false),
+#if (QT_VERSION > QT_VERSION_CHECK(6,0,0))
+      inAcquireMode(false), reqMutex(QRecursiveMutex()), ignoreQ(false)
+#else
       inAcquireMode(false), reqMutex(QMutex::Recursive), ignoreQ(false)
+#endif
 {
     identifier = resourceSetId++;
     memset(resourceSet, 0, sizeof(Resource *)*NumberOfTypes);