Port deprecated parts to Qt5

sailfishos · Dec 12, 2017 · e9c1cf3 · e9c1cf3
1 parent 79a186a
commit e9c1cf3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/src/src.pro b/src/src.pro
@@ -12,7 +12,6 @@ TARGET = lipstick-qt5
 # Override the version from the spec file, we need .so version 1.0
 VERSION = 1.0
 
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x000000
 DEFINES += LIPSTICK_BUILD_LIBRARY
 DEFINES += VERSION=\\\"$${VERSION}\\\"
 DEFINES += MESA_EGL_NO_X11_HEADERS

diff --git a/src/utilities/qobjectlistmodel.cpp b/src/utilities/qobjectlistmodel.cpp
@@ -22,10 +22,14 @@
 QObjectListModel::QObjectListModel(QObject *parent, QList<QObject*> *list)
     : QAbstractListModel(parent),
       _list(list)
+{
+}
+
+QHash<int, QByteArray> QObjectListModel::roleNames() const
 {
     QHash<int, QByteArray> roles;
     roles[Qt::UserRole + 1] = "object";
-    setRoleNames(roles);
+    return roles;
 }
 
 int QObjectListModel::indexOf(QObject *obj) const

diff --git a/src/utilities/qobjectlistmodel.h b/src/utilities/qobjectlistmodel.h
@@ -32,6 +32,8 @@ class LIPSTICK_EXPORT QObjectListModel : public QAbstractListModel
 
 public:
     explicit QObjectListModel(QObject *parent = 0, QList<QObject*> *list = new QList<QObject*>());
+
+    QHash<int, QByteArray> roleNames() const;
     int rowCount(const QModelIndex &parent = QModelIndex()) const;
     int itemCount() const;
     int columnCount(const QModelIndex &parent = QModelIndex()) const;

diff --git a/src/volume/pulseaudiocontrol.cpp b/src/volume/pulseaudiocontrol.cpp
@@ -97,7 +97,7 @@ void PulseAudioControl::openConnection()
         message.setArguments(QVariantList() << "org.PulseAudio.ServerLookup1" << "Address");
         QDBusMessage reply = QDBusConnection::sessionBus().call(message);
         if (reply.type() == QDBusMessage::ReplyMessage && reply.arguments().count() > 0) {
-            addressArray = reply.arguments().first().value<QDBusVariant>().variant().toString().toAscii();
+            addressArray = reply.arguments().first().value<QDBusVariant>().variant().toString().toLatin1();
             pa_bus_address = addressArray.data();
         }
     }

diff --git a/tests/common.pri b/tests/common.pri
@@ -16,7 +16,7 @@ DEPENDPATH = $$INCLUDEPATH
 QT += testlib
 TEMPLATE = app
 DEFINES += UNIT_TEST
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x000000
+
 CONFIG -= link_prl
 CONFIG += link_pkgconfig
 PKGCONFIG += mlite5