diff -Nru bluez-qt-5.30.0/autotests/adaptertest.cpp bluez-qt-5.31.0/autotests/adaptertest.cpp
--- bluez-qt-5.30.0/autotests/adaptertest.cpp	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/autotests/adaptertest.cpp	2017-02-04 18:02:11.000000000 +0000
@@ -35,7 +35,7 @@
 using namespace BluezQt;
 
 AdapterTest::AdapterTest()
-    : m_manager(0)
+    : m_manager(nullptr)
 {
     Autotests::registerMetatypes();
 }
diff -Nru bluez-qt-5.30.0/autotests/agentmanagertest.h bluez-qt-5.31.0/autotests/agentmanagertest.h
--- bluez-qt-5.30.0/autotests/agentmanagertest.h	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/autotests/agentmanagertest.h	2017-02-04 18:02:11.000000000 +0000
@@ -32,7 +32,7 @@
     Q_OBJECT
 
 public:
-    explicit TestAgent(QObject *parent = Q_NULLPTR);
+    explicit TestAgent(QObject *parent = nullptr);
 
     QDBusObjectPath objectPath() const Q_DECL_OVERRIDE;
 
diff -Nru bluez-qt-5.30.0/autotests/autotests.cpp bluez-qt-5.31.0/autotests/autotests.cpp
--- bluez-qt-5.30.0/autotests/autotests.cpp	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/autotests/autotests.cpp	2017-02-04 18:02:11.000000000 +0000
@@ -38,7 +38,7 @@
 #include <QDBusServiceWatcher>
 #include <QDBusConnectionInterface>
 
-QProcess *FakeBluez::s_process = Q_NULLPTR;
+QProcess *FakeBluez::s_process = nullptr;
 
 class StartJob : public QObject
 {
@@ -59,7 +59,7 @@
 };
 
 StartJob::StartJob()
-    : QObject(0)
+    : QObject(nullptr)
     , m_fakebluezPath(QFINDTESTDATA("fakebluez/fakebluez"))
 {
 }
diff -Nru bluez-qt-5.30.0/autotests/devicetest.cpp bluez-qt-5.31.0/autotests/devicetest.cpp
--- bluez-qt-5.30.0/autotests/devicetest.cpp	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/autotests/devicetest.cpp	2017-02-04 18:02:11.000000000 +0000
@@ -34,7 +34,7 @@
 using namespace BluezQt;
 
 DeviceTest::DeviceTest()
-    : m_manager(0)
+    : m_manager(nullptr)
 {
     Autotests::registerMetatypes();
 }
diff -Nru bluez-qt-5.30.0/autotests/fakebluez/adapterinterface.h bluez-qt-5.31.0/autotests/fakebluez/adapterinterface.h
--- bluez-qt-5.30.0/autotests/fakebluez/adapterinterface.h	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/autotests/fakebluez/adapterinterface.h	2017-02-04 18:02:11.000000000 +0000
@@ -30,7 +30,7 @@
 class AdapterObject : public QObject
 {
 public:
-    explicit AdapterObject(const QDBusObjectPath &path, QObject *parent = Q_NULLPTR);
+    explicit AdapterObject(const QDBusObjectPath &path, QObject *parent = nullptr);
 };
 
 class AdapterInterface : public QDBusAbstractAdaptor, public Object
@@ -51,7 +51,7 @@
     Q_PROPERTY(QString Modalias READ modalias)
 
 public:
-    explicit AdapterInterface(const QDBusObjectPath &path, const QVariantMap &properties, QObject *parent = Q_NULLPTR);
+    explicit AdapterInterface(const QDBusObjectPath &path, const QVariantMap &properties, QObject *parent = nullptr);
 
     QString address() const;
 
diff -Nru bluez-qt-5.30.0/autotests/fakebluez/agentmanager.h bluez-qt-5.31.0/autotests/fakebluez/agentmanager.h
--- bluez-qt-5.30.0/autotests/fakebluez/agentmanager.h	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/autotests/fakebluez/agentmanager.h	2017-02-04 18:02:11.000000000 +0000
@@ -33,7 +33,7 @@
     Q_CLASSINFO("D-Bus Interface", "org.bluez.AgentManager1")
 
 public:
-    explicit AgentManager(QObject *parent = Q_NULLPTR);
+    explicit AgentManager(QObject *parent = nullptr);
 
     void runAction(const QString &actionName, const QVariantMap &properties);
 
diff -Nru bluez-qt-5.30.0/autotests/fakebluez/deviceinterface.cpp bluez-qt-5.31.0/autotests/fakebluez/deviceinterface.cpp
--- bluez-qt-5.30.0/autotests/fakebluez/deviceinterface.cpp	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/autotests/fakebluez/deviceinterface.cpp	2017-02-04 18:02:11.000000000 +0000
@@ -39,7 +39,7 @@
 // DeviceInterface
 DeviceInterface::DeviceInterface(const QDBusObjectPath &path, const QVariantMap &properties, QObject *parent)
     : QDBusAbstractAdaptor(parent)
-    , m_mediaPlayer(0)
+    , m_mediaPlayer(nullptr)
 {
     setPath(path);
     setObjectParent(parent);
@@ -250,5 +250,5 @@
     manager->removeObject(m_mediaPlayer);
     m_connectedUuids.removeOne(MediaPlayerUuid);
 
-    m_mediaPlayer = 0;
+    m_mediaPlayer = nullptr;
 }
diff -Nru bluez-qt-5.30.0/autotests/fakebluez/deviceinterface.h bluez-qt-5.31.0/autotests/fakebluez/deviceinterface.h
--- bluez-qt-5.30.0/autotests/fakebluez/deviceinterface.h	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/autotests/fakebluez/deviceinterface.h	2017-02-04 18:02:11.000000000 +0000
@@ -32,7 +32,7 @@
 class DeviceObject : public QObject
 {
 public:
-    explicit DeviceObject(const QDBusObjectPath &path, QObject *parent = Q_NULLPTR);
+    explicit DeviceObject(const QDBusObjectPath &path, QObject *parent = nullptr);
 };
 
 class DeviceInterface : public QDBusAbstractAdaptor, public Object
@@ -56,7 +56,7 @@
     Q_PROPERTY(QString Modalias READ modalias)
 
 public:
-    explicit DeviceInterface(const QDBusObjectPath &path, const QVariantMap &properties, QObject *parent = Q_NULLPTR);
+    explicit DeviceInterface(const QDBusObjectPath &path, const QVariantMap &properties, QObject *parent = nullptr);
 
     QString address() const;
 
diff -Nru bluez-qt-5.30.0/autotests/fakebluez/devicemanager.h bluez-qt-5.31.0/autotests/fakebluez/devicemanager.h
--- bluez-qt-5.30.0/autotests/fakebluez/devicemanager.h	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/autotests/fakebluez/devicemanager.h	2017-02-04 18:02:11.000000000 +0000
@@ -30,7 +30,7 @@
     Q_OBJECT
 
 public:
-    explicit DeviceManager(ObjectManager *parent = Q_NULLPTR);
+    explicit DeviceManager(ObjectManager *parent = nullptr);
 
     void runAction(const QString &actionName, const QVariantMap &properties);
 
diff -Nru bluez-qt-5.30.0/autotests/fakebluez/fakebluez.cpp bluez-qt-5.31.0/autotests/fakebluez/fakebluez.cpp
--- bluez-qt-5.30.0/autotests/fakebluez/fakebluez.cpp	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/autotests/fakebluez/fakebluez.cpp	2017-02-04 18:02:11.000000000 +0000
@@ -35,7 +35,7 @@
 class ObexObject : public QObject
 {
 public:
-    explicit ObexObject(QObject *parent = Q_NULLPTR)
+    explicit ObexObject(QObject *parent = nullptr)
         : QObject(parent)
     {
         QDBusConnection::sessionBus().registerObject(QStringLiteral("/org/bluez/obex"), this);
@@ -46,13 +46,13 @@
 FakeBluez::FakeBluez(QObject *parent)
     : QObject(parent)
     , m_testInterface(new TestInterface(this))
-    , m_objectManager(0)
-    , m_agentManager(0)
-    , m_profileManager(0)
-    , m_deviceManager(0)
-    , m_obexObject(0)
-    , m_obexAgentManager(0)
-    , m_obexClient(0)
+    , m_objectManager(nullptr)
+    , m_agentManager(nullptr)
+    , m_profileManager(nullptr)
+    , m_deviceManager(nullptr)
+    , m_obexObject(nullptr)
+    , m_obexAgentManager(nullptr)
+    , m_obexClient(nullptr)
 {
     QDBusConnection::sessionBus().registerObject(QStringLiteral("/"), this);
 }
@@ -110,7 +110,7 @@
 {
     // Everything is parented to ObjectManager
     delete m_objectManager;
-    m_objectManager = Q_NULLPTR;
+    m_objectManager = nullptr;
 }
 
 void FakeBluez::createObjectManager()
diff -Nru bluez-qt-5.30.0/autotests/fakebluez/fakebluez.h bluez-qt-5.31.0/autotests/fakebluez/fakebluez.h
--- bluez-qt-5.30.0/autotests/fakebluez/fakebluez.h	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/autotests/fakebluez/fakebluez.h	2017-02-04 18:02:11.000000000 +0000
@@ -38,7 +38,7 @@
     Q_OBJECT
 
 public:
-    explicit FakeBluez(QObject *parent = Q_NULLPTR);
+    explicit FakeBluez(QObject *parent = nullptr);
 
     void runTest(const QString &testName);
     void runAction(const QString &object, const QString &actionName, const QVariantMap &properties);
diff -Nru bluez-qt-5.30.0/autotests/fakebluez/inputinterface.h bluez-qt-5.31.0/autotests/fakebluez/inputinterface.h
--- bluez-qt-5.30.0/autotests/fakebluez/inputinterface.h	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/autotests/fakebluez/inputinterface.h	2017-02-04 18:02:11.000000000 +0000
@@ -31,7 +31,7 @@
 class InputObject : public QObject
 {
 public:
-    explicit InputObject(const QDBusObjectPath &path, QObject *parent = Q_NULLPTR);
+    explicit InputObject(const QDBusObjectPath &path, QObject *parent = nullptr);
 };
 
 class InputInterface : public QDBusAbstractAdaptor, public Object
@@ -41,7 +41,7 @@
     Q_PROPERTY(QString ReconnectMode READ reconnectMode)
 
 public:
-    explicit InputInterface(const QDBusObjectPath &path, const QVariantMap &properties, QObject *parent = Q_NULLPTR);
+    explicit InputInterface(const QDBusObjectPath &path, const QVariantMap &properties, QObject *parent = nullptr);
 
     QString reconnectMode() const;
 };
diff -Nru bluez-qt-5.30.0/autotests/fakebluez/mediaplayerinterface.h bluez-qt-5.31.0/autotests/fakebluez/mediaplayerinterface.h
--- bluez-qt-5.30.0/autotests/fakebluez/mediaplayerinterface.h	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/autotests/fakebluez/mediaplayerinterface.h	2017-02-04 18:02:11.000000000 +0000
@@ -31,7 +31,7 @@
 class MediaPlayerObject : public QObject
 {
 public:
-    explicit MediaPlayerObject(const QDBusObjectPath &path, QObject *parent = Q_NULLPTR);
+    explicit MediaPlayerObject(const QDBusObjectPath &path, QObject *parent = nullptr);
 };
 
 class MediaPlayerInterface : public QDBusAbstractAdaptor, public Object
@@ -48,7 +48,7 @@
     Q_PROPERTY(QDBusObjectPath Device READ device)
 
 public:
-    explicit MediaPlayerInterface(const QDBusObjectPath &path, const QVariantMap &properties, QObject *parent = Q_NULLPTR);
+    explicit MediaPlayerInterface(const QDBusObjectPath &path, const QVariantMap &properties, QObject *parent = nullptr);
 
     QString name() const;
 
diff -Nru bluez-qt-5.30.0/autotests/fakebluez/obexagentmanager.h bluez-qt-5.31.0/autotests/fakebluez/obexagentmanager.h
--- bluez-qt-5.30.0/autotests/fakebluez/obexagentmanager.h	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/autotests/fakebluez/obexagentmanager.h	2017-02-04 18:02:11.000000000 +0000
@@ -33,7 +33,7 @@
     Q_CLASSINFO("D-Bus Interface", "org.bluez.obex.AgentManager1")
 
 public:
-    explicit ObexAgentManager(QObject *parent = Q_NULLPTR);
+    explicit ObexAgentManager(QObject *parent = nullptr);
 
     void runAction(const QString &actionName, const QVariantMap &properties);
 
diff -Nru bluez-qt-5.30.0/autotests/fakebluez/obexclient.h bluez-qt-5.31.0/autotests/fakebluez/obexclient.h
--- bluez-qt-5.30.0/autotests/fakebluez/obexclient.h	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/autotests/fakebluez/obexclient.h	2017-02-04 18:02:11.000000000 +0000
@@ -33,7 +33,7 @@
     Q_CLASSINFO("D-Bus Interface", "org.bluez.obex.Client1")
 
 public:
-    explicit ObexClient(QObject *parent = Q_NULLPTR);
+    explicit ObexClient(QObject *parent = nullptr);
 
     void runAction(const QString &actionName, const QVariantMap &properties);
 
diff -Nru bluez-qt-5.30.0/autotests/fakebluez/object.cpp bluez-qt-5.31.0/autotests/fakebluez/object.cpp
--- bluez-qt-5.30.0/autotests/fakebluez/object.cpp	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/autotests/fakebluez/object.cpp	2017-02-04 18:02:11.000000000 +0000
@@ -25,7 +25,7 @@
 #include <QDBusAbstractAdaptor>
 
 Object::Object()
-    : m_parent(0)
+    : m_parent(nullptr)
 {
 }
 
diff -Nru bluez-qt-5.30.0/autotests/fakebluez/objectmanager.cpp bluez-qt-5.31.0/autotests/fakebluez/objectmanager.cpp
--- bluez-qt-5.30.0/autotests/fakebluez/objectmanager.cpp	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/autotests/fakebluez/objectmanager.cpp	2017-02-04 18:02:11.000000000 +0000
@@ -24,7 +24,7 @@
 #include <QDBusMetaType>
 #include <QDBusConnection>
 
-ObjectManager *s_instance = Q_NULLPTR;
+ObjectManager *s_instance = nullptr;
 
 ObjectManager::ObjectManager(QObject *parent)
     : QDBusAbstractAdaptor(parent)
@@ -39,7 +39,7 @@
 
 ObjectManager::~ObjectManager()
 {
-    s_instance = Q_NULLPTR;
+    s_instance = nullptr;
     qDeleteAll(m_autoDeleteObjects);
 }
 
diff -Nru bluez-qt-5.30.0/autotests/fakebluez/objectmanager.h bluez-qt-5.31.0/autotests/fakebluez/objectmanager.h
--- bluez-qt-5.30.0/autotests/fakebluez/objectmanager.h	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/autotests/fakebluez/objectmanager.h	2017-02-04 18:02:11.000000000 +0000
@@ -39,7 +39,7 @@
     Q_CLASSINFO("D-Bus Interface", "org.freedesktop.DBus.ObjectManager")
 
 public:
-    explicit ObjectManager(QObject *parent = Q_NULLPTR);
+    explicit ObjectManager(QObject *parent = nullptr);
     ~ObjectManager();
 
     void addObject(Object *object);
diff -Nru bluez-qt-5.30.0/autotests/fakebluez/profilemanager.h bluez-qt-5.31.0/autotests/fakebluez/profilemanager.h
--- bluez-qt-5.30.0/autotests/fakebluez/profilemanager.h	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/autotests/fakebluez/profilemanager.h	2017-02-04 18:02:11.000000000 +0000
@@ -33,7 +33,7 @@
     Q_CLASSINFO("D-Bus Interface", "org.bluez.ProfileManager1")
 
 public:
-    explicit ProfileManager(QObject *parent = Q_NULLPTR);
+    explicit ProfileManager(QObject *parent = nullptr);
 
 public Q_SLOTS:
     void RegisterProfile(const QDBusObjectPath &path, const QString &uuid, const QVariantMap &options, const QDBusMessage &msg);
diff -Nru bluez-qt-5.30.0/autotests/inputtest.cpp bluez-qt-5.31.0/autotests/inputtest.cpp
--- bluez-qt-5.30.0/autotests/inputtest.cpp	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/autotests/inputtest.cpp	2017-02-04 18:02:11.000000000 +0000
@@ -36,7 +36,7 @@
 Q_DECLARE_METATYPE(Input::ReconnectMode)
 
 InputTest::InputTest()
-    : m_manager(0)
+    : m_manager(nullptr)
 {
     Autotests::registerMetatypes();
 
diff -Nru bluez-qt-5.30.0/autotests/mediaplayertest.cpp bluez-qt-5.31.0/autotests/mediaplayertest.cpp
--- bluez-qt-5.30.0/autotests/mediaplayertest.cpp	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/autotests/mediaplayertest.cpp	2017-02-04 18:02:11.000000000 +0000
@@ -40,7 +40,7 @@
 Q_DECLARE_METATYPE(MediaPlayer::Status)
 
 MediaPlayerTest::MediaPlayerTest()
-    : m_manager(0)
+    : m_manager(nullptr)
 {
     Autotests::registerMetatypes();
 
diff -Nru bluez-qt-5.30.0/CMakeLists.txt bluez-qt-5.31.0/CMakeLists.txt
--- bluez-qt-5.30.0/CMakeLists.txt	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/CMakeLists.txt	2017-02-04 18:02:11.000000000 +0000
@@ -1,10 +1,10 @@
 cmake_minimum_required(VERSION 3.0)
 
-set(KF5_VERSION "5.30.0") # handled by release scripts
+set(KF5_VERSION "5.31.0") # handled by release scripts
 project(BluezQt VERSION ${KF5_VERSION})
 
 include(FeatureSummary)
-find_package(ECM 5.30.0 NO_MODULE)
+find_package(ECM 5.31.0 NO_MODULE)
 set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules")
 feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
@@ -28,7 +28,7 @@
 )
 
 # Dependencies
-set(REQUIRED_QT_VERSION 5.5.0)
+set(REQUIRED_QT_VERSION 5.6.0)
 
 # Required Qt5 components to build this framework
 find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core DBus Network)
diff -Nru bluez-qt-5.30.0/debian/changelog bluez-qt-5.31.0/debian/changelog
--- bluez-qt-5.30.0/debian/changelog	2017-02-01 18:37:55.000000000 +0000
+++ bluez-qt-5.31.0/debian/changelog	2017-02-14 22:53:58.000000000 +0000
@@ -1,3 +1,11 @@
+bluez-qt (5.31.0-0ubuntu1) zesty; urgency=medium
+
+  * Pass '-fno-keep-inline-functions' to gcc in the acc test in order to
+    avoid possible spurious test failures.
+  * New upstream release (5.31.0)
+
+ -- José Manuel Santamaría Lema <panfaust@gmail.com>  Tue, 14 Feb 2017 22:53:58 +0000
+
 bluez-qt (5.30.0-0ubuntu1) zesty; urgency=low
 
   * New upstream release (5.30.0)
diff -Nru bluez-qt-5.30.0/debian/control bluez-qt-5.31.0/debian/control
--- bluez-qt-5.30.0/debian/control	2017-02-01 18:37:55.000000000 +0000
+++ bluez-qt-5.31.0/debian/control	2017-02-14 22:53:58.000000000 +0000
@@ -5,7 +5,7 @@
 Uploaders: Maximiliano Curia <maxy@debian.org>
 Build-Depends: cmake (>= 2.8.12~),
                debhelper (>= 9),
-               extra-cmake-modules (>= 5.30.0~),
+               extra-cmake-modules (>= 5.31.0~),
                pkg-kde-tools (>> 0.15.15),
                qml-module-qttest,
                qtbase5-dev (>= 5.6.1~),
diff -Nru bluez-qt-5.30.0/debian/libkf5bluezqt-dev.acc.in bluez-qt-5.31.0/debian/libkf5bluezqt-dev.acc.in
--- bluez-qt-5.30.0/debian/libkf5bluezqt-dev.acc.in	2017-02-01 18:37:55.000000000 +0000
+++ bluez-qt-5.31.0/debian/libkf5bluezqt-dev.acc.in	2017-02-14 22:53:58.000000000 +0000
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <descriptor>
 
 <version>
@@ -17,6 +17,7 @@
 <gcc_options>
     -fPIC
     -std=gnu++11
+    -fno-keep-inline-functions
 </gcc_options>
 
-</descriptor>
+</descriptor>
\ No newline at end of file
diff -Nru bluez-qt-5.30.0/src/adapter_p.cpp bluez-qt-5.31.0/src/adapter_p.cpp
--- bluez-qt-5.30.0/src/adapter_p.cpp	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/src/adapter_p.cpp	2017-02-04 18:02:11.000000000 +0000
@@ -30,7 +30,7 @@
 
 AdapterPrivate::AdapterPrivate(const QString &path, const QVariantMap &properties)
     : QObject()
-    , m_dbusProperties(0)
+    , m_dbusProperties(nullptr)
     , m_adapterClass(0)
     , m_powered(0)
     , m_discoverable(false)
diff -Nru bluez-qt-5.30.0/src/agent.h bluez-qt-5.31.0/src/agent.h
--- bluez-qt-5.30.0/src/agent.h	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/src/agent.h	2017-02-04 18:02:11.000000000 +0000
@@ -69,7 +69,7 @@
      *
      * @param parent
      */
-    explicit Agent(QObject *parent = Q_NULLPTR);
+    explicit Agent(QObject *parent = nullptr);
 
     /**
      * D-Bus object path of the agent.
diff -Nru bluez-qt-5.30.0/src/device_p.cpp bluez-qt-5.31.0/src/device_p.cpp
--- bluez-qt-5.30.0/src/device_p.cpp	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/src/device_p.cpp	2017-02-04 18:02:11.000000000 +0000
@@ -37,7 +37,7 @@
 
 DevicePrivate::DevicePrivate(const QString &path, const QVariantMap &properties, const AdapterPtr &adapter)
     : QObject()
-    , m_dbusProperties(0)
+    , m_dbusProperties(nullptr)
     , m_deviceClass(0)
     , m_appearance(0)
     , m_paired(false)
diff -Nru bluez-qt-5.30.0/src/devicesmodel.cpp bluez-qt-5.31.0/src/devicesmodel.cpp
--- bluez-qt-5.30.0/src/devicesmodel.cpp	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/src/devicesmodel.cpp	2017-02-04 18:02:11.000000000 +0000
@@ -48,7 +48,7 @@
 DevicesModelPrivate::DevicesModelPrivate(DevicesModel *q)
     : QObject(q)
     , q(q)
-    , m_manager(0)
+    , m_manager(nullptr)
 {
 }
 
diff -Nru bluez-qt-5.30.0/src/devicesmodel.h bluez-qt-5.31.0/src/devicesmodel.h
--- bluez-qt-5.30.0/src/devicesmodel.h	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/src/devicesmodel.h	2017-02-04 18:02:11.000000000 +0000
@@ -118,7 +118,7 @@
      * @param manager manager to be used
      * @param parent
      */
-    explicit DevicesModel(Manager *manager, QObject *parent = Q_NULLPTR);
+    explicit DevicesModel(Manager *manager, QObject *parent = nullptr);
 
     /**
       * Destroys a DevicesModel object.
diff -Nru bluez-qt-5.30.0/src/imports/declarativeadapter.cpp bluez-qt-5.31.0/src/imports/declarativeadapter.cpp
--- bluez-qt-5.30.0/src/imports/declarativeadapter.cpp	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/src/imports/declarativeadapter.cpp	2017-02-04 18:02:11.000000000 +0000
@@ -168,7 +168,7 @@
 
 QQmlListProperty<DeclarativeDevice> DeclarativeAdapter::devices()
 {
-    return QQmlListProperty<DeclarativeDevice>(this, 0, devicesCountFunction, devicesAtFunction);
+    return QQmlListProperty<DeclarativeDevice>(this, nullptr, devicesCountFunction, devicesAtFunction);
 }
 
 DeclarativeDevice *DeclarativeAdapter::deviceForAddress(const QString &address) const
@@ -206,7 +206,7 @@
 DeclarativeDevice *DeclarativeAdapter::declarativeDeviceFromPtr(BluezQt::DevicePtr ptr) const
 {
     if (!ptr) {
-        return Q_NULLPTR;
+        return nullptr;
     }
     return m_devices.value(ptr->ubi());
 }
diff -Nru bluez-qt-5.30.0/src/imports/declarativeadapter.h bluez-qt-5.31.0/src/imports/declarativeadapter.h
--- bluez-qt-5.30.0/src/imports/declarativeadapter.h	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/src/imports/declarativeadapter.h	2017-02-04 18:02:11.000000000 +0000
@@ -49,7 +49,7 @@
     Q_PROPERTY(QQmlListProperty<DeclarativeDevice> devices READ devices NOTIFY devicesChanged)
 
 public:
-    explicit DeclarativeAdapter(BluezQt::AdapterPtr adapter, QObject *parent = Q_NULLPTR);
+    explicit DeclarativeAdapter(BluezQt::AdapterPtr adapter, QObject *parent = nullptr);
 
     QString ubi() const;
 
diff -Nru bluez-qt-5.30.0/src/imports/declarativedevice.cpp bluez-qt-5.31.0/src/imports/declarativedevice.cpp
--- bluez-qt-5.30.0/src/imports/declarativedevice.cpp	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/src/imports/declarativedevice.cpp	2017-02-04 18:02:11.000000000 +0000
@@ -31,8 +31,8 @@
     : QObject(adapter)
     , m_device(device)
     , m_adapter(adapter)
-    , m_input(0)
-    , m_mediaPlayer(0)
+    , m_input(nullptr)
+    , m_mediaPlayer(nullptr)
 {
     connect(m_device.data(), &BluezQt::Device::nameChanged, this, &DeclarativeDevice::nameChanged);
     connect(m_device.data(), &BluezQt::Device::friendlyNameChanged, this, &DeclarativeDevice::friendlyNameChanged);
@@ -213,7 +213,7 @@
 {
     if (m_input) {
         m_input->deleteLater();
-        m_input = Q_NULLPTR;
+        m_input = nullptr;
     }
 
     if (m_device->input()) {
@@ -227,7 +227,7 @@
 {
     if (m_mediaPlayer) {
         m_mediaPlayer->deleteLater();
-        m_mediaPlayer = Q_NULLPTR;
+        m_mediaPlayer = nullptr;
     }
 
     if (m_device->mediaPlayer()) {
diff -Nru bluez-qt-5.30.0/src/imports/declarativedevicesmodel.cpp bluez-qt-5.31.0/src/imports/declarativedevicesmodel.cpp
--- bluez-qt-5.30.0/src/imports/declarativedevicesmodel.cpp	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/src/imports/declarativedevicesmodel.cpp	2017-02-04 18:02:11.000000000 +0000
@@ -28,8 +28,8 @@
 
 DeclarativeDevicesModel::DeclarativeDevicesModel(QObject *parent)
     : QSortFilterProxyModel(parent)
-    , m_manager(0)
-    , m_model(0)
+    , m_manager(nullptr)
+    , m_model(nullptr)
 {
 }
 
diff -Nru bluez-qt-5.30.0/src/imports/declarativedevicesmodel.h bluez-qt-5.31.0/src/imports/declarativedevicesmodel.h
--- bluez-qt-5.30.0/src/imports/declarativedevicesmodel.h	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/src/imports/declarativedevicesmodel.h	2017-02-04 18:02:11.000000000 +0000
@@ -41,7 +41,7 @@
         MediaPlayerRole = BluezQt::DevicesModel::LastRole + 3
     };
 
-    explicit DeclarativeDevicesModel(QObject *parent = Q_NULLPTR);
+    explicit DeclarativeDevicesModel(QObject *parent = nullptr);
 
     DeclarativeManager *manager() const;
     void setManager(DeclarativeManager *manager);
diff -Nru bluez-qt-5.30.0/src/imports/declarativeinput.h bluez-qt-5.31.0/src/imports/declarativeinput.h
--- bluez-qt-5.30.0/src/imports/declarativeinput.h	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/src/imports/declarativeinput.h	2017-02-04 18:02:11.000000000 +0000
@@ -31,7 +31,7 @@
     Q_PROPERTY(BluezQt::Input::ReconnectMode reconnectMode READ reconnectMode NOTIFY reconnectModeChanged)
 
 public:
-    explicit DeclarativeInput(BluezQt::InputPtr input, QObject *parent = Q_NULLPTR);
+    explicit DeclarativeInput(BluezQt::InputPtr input, QObject *parent = nullptr);
 
     BluezQt::Input::ReconnectMode reconnectMode() const;
 
diff -Nru bluez-qt-5.30.0/src/imports/declarativemanager.cpp bluez-qt-5.31.0/src/imports/declarativemanager.cpp
--- bluez-qt-5.30.0/src/imports/declarativemanager.cpp	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/src/imports/declarativemanager.cpp	2017-02-04 18:02:11.000000000 +0000
@@ -90,18 +90,18 @@
 
 QQmlListProperty<DeclarativeAdapter> DeclarativeManager::declarativeAdapters()
 {
-    return QQmlListProperty<DeclarativeAdapter>(this, 0, adaptersCountFunction, adaptersAtFunction);
+    return QQmlListProperty<DeclarativeAdapter>(this, nullptr, adaptersCountFunction, adaptersAtFunction);
 }
 
 QQmlListProperty<DeclarativeDevice> DeclarativeManager::declarativeDevices()
 {
-    return QQmlListProperty<DeclarativeDevice>(this, 0, devicesCountFunction, devicesAtFunction);
+    return QQmlListProperty<DeclarativeDevice>(this, nullptr, devicesCountFunction, devicesAtFunction);
 }
 
 DeclarativeAdapter *DeclarativeManager::declarativeAdapterFromPtr(BluezQt::AdapterPtr ptr) const
 {
     if (!ptr) {
-        return Q_NULLPTR;
+        return nullptr;
     }
     return m_adapters.value(ptr->ubi());
 }
@@ -109,7 +109,7 @@
 DeclarativeDevice *DeclarativeManager::declarativeDeviceFromPtr(BluezQt::DevicePtr ptr) const
 {
     if (!ptr) {
-        return Q_NULLPTR;
+        return nullptr;
     }
     return m_devices.value(ptr->ubi());
 }
diff -Nru bluez-qt-5.30.0/src/imports/declarativemanager.h bluez-qt-5.31.0/src/imports/declarativemanager.h
--- bluez-qt-5.30.0/src/imports/declarativemanager.h	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/src/imports/declarativemanager.h	2017-02-04 18:02:11.000000000 +0000
@@ -39,7 +39,7 @@
     Q_PROPERTY(QQmlListProperty<DeclarativeDevice> devices READ declarativeDevices NOTIFY devicesChanged)
 
 public:
-    explicit DeclarativeManager(QObject *parent = Q_NULLPTR);
+    explicit DeclarativeManager(QObject *parent = nullptr);
 
     DeclarativeAdapter *usableAdapter() const;
     QQmlListProperty<DeclarativeAdapter> declarativeAdapters();
diff -Nru bluez-qt-5.30.0/src/imports/declarativemediaplayer.h bluez-qt-5.31.0/src/imports/declarativemediaplayer.h
--- bluez-qt-5.30.0/src/imports/declarativemediaplayer.h	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/src/imports/declarativemediaplayer.h	2017-02-04 18:02:11.000000000 +0000
@@ -39,7 +39,7 @@
     Q_PROPERTY(quint32 position READ position NOTIFY positionChanged)
 
 public:
-    explicit DeclarativeMediaPlayer(BluezQt::MediaPlayerPtr mediaPlayer, QObject *parent = Q_NULLPTR);
+    explicit DeclarativeMediaPlayer(BluezQt::MediaPlayerPtr mediaPlayer, QObject *parent = nullptr);
 
     QString name() const;
 
diff -Nru bluez-qt-5.30.0/src/job.cpp bluez-qt-5.31.0/src/job.cpp
--- bluez-qt-5.30.0/src/job.cpp	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/src/job.cpp	2017-02-04 18:02:11.000000000 +0000
@@ -31,7 +31,7 @@
 
 JobPrivate::JobPrivate()
 {
-    eventLoop = Q_NULLPTR;
+    eventLoop = nullptr;
     error = Job::NoError;
     running = false;
     finished = false;
diff -Nru bluez-qt-5.30.0/src/job.h bluez-qt-5.31.0/src/job.h
--- bluez-qt-5.30.0/src/job.h	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/src/job.h	2017-02-04 18:02:11.000000000 +0000
@@ -68,7 +68,7 @@
      *
      * @param parent
      */
-    explicit Job(QObject *parent = Q_NULLPTR);
+    explicit Job(QObject *parent = nullptr);
 
     /**
      * Destroys a Job object.
diff -Nru bluez-qt-5.30.0/src/manager.h bluez-qt-5.31.0/src/manager.h
--- bluez-qt-5.30.0/src/manager.h	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/src/manager.h	2017-02-04 18:02:11.000000000 +0000
@@ -104,7 +104,7 @@
      *
      * @param parent
      */
-    explicit Manager(QObject *parent = Q_NULLPTR);
+    explicit Manager(QObject *parent = nullptr);
 
     /**
      * Destroys a Manager object.
diff -Nru bluez-qt-5.30.0/src/manager_p.cpp bluez-qt-5.31.0/src/manager_p.cpp
--- bluez-qt-5.30.0/src/manager_p.cpp	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/src/manager_p.cpp	2017-02-04 18:02:11.000000000 +0000
@@ -39,9 +39,9 @@
 ManagerPrivate::ManagerPrivate(Manager *parent)
     : QObject(parent)
     , q(parent)
-    , m_dbusObjectManager(0)
-    , m_bluezAgentManager(0)
-    , m_bluezProfileManager(0)
+    , m_dbusObjectManager(nullptr)
+    , m_bluezAgentManager(nullptr)
+    , m_bluezProfileManager(nullptr)
     , m_usableAdapter(0)
     , m_initialized(false)
     , m_bluezRunning(false)
@@ -206,12 +206,12 @@
 
     if (m_dbusObjectManager) {
         m_dbusObjectManager->deleteLater();
-        m_dbusObjectManager = Q_NULLPTR;
+        m_dbusObjectManager = nullptr;
     }
 
     if (m_bluezAgentManager) {
         m_bluezAgentManager->deleteLater();
-        m_bluezAgentManager = Q_NULLPTR;
+        m_bluezAgentManager = nullptr;
     }
 }
 
diff -Nru bluez-qt-5.30.0/src/mediaplayer_p.cpp bluez-qt-5.31.0/src/mediaplayer_p.cpp
--- bluez-qt-5.30.0/src/mediaplayer_p.cpp	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/src/mediaplayer_p.cpp	2017-02-04 18:02:11.000000000 +0000
@@ -75,7 +75,7 @@
 
 MediaPlayerPrivate::MediaPlayerPrivate(const QString &path, const QVariantMap &properties)
     : QObject()
-    , m_dbusProperties(0)
+    , m_dbusProperties(nullptr)
     , m_equalizer(MediaPlayer::EqualizerOff)
     , m_repeat(MediaPlayer::RepeatOff)
     , m_shuffle(MediaPlayer::ShuffleOff)
diff -Nru bluez-qt-5.30.0/src/obexagent.h bluez-qt-5.31.0/src/obexagent.h
--- bluez-qt-5.30.0/src/obexagent.h	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/src/obexagent.h	2017-02-04 18:02:11.000000000 +0000
@@ -57,7 +57,7 @@
      *
      * @param parent
      */
-    explicit ObexAgent(QObject *parent = Q_NULLPTR);
+    explicit ObexAgent(QObject *parent = nullptr);
 
     /**
      * D-Bus object path of the agent.
diff -Nru bluez-qt-5.30.0/src/obexfiletransfer.h bluez-qt-5.31.0/src/obexfiletransfer.h
--- bluez-qt-5.30.0/src/obexfiletransfer.h	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/src/obexfiletransfer.h	2017-02-04 18:02:11.000000000 +0000
@@ -54,7 +54,7 @@
      * @param path path of session
      * @param parent
      */
-    explicit ObexFileTransfer(const QDBusObjectPath &path, QObject *parent = Q_NULLPTR);
+    explicit ObexFileTransfer(const QDBusObjectPath &path, QObject *parent = nullptr);
 
     /**
      * Destroys an ObexFileTransfer object.
diff -Nru bluez-qt-5.30.0/src/obexmanager.h bluez-qt-5.31.0/src/obexmanager.h
--- bluez-qt-5.30.0/src/obexmanager.h	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/src/obexmanager.h	2017-02-04 18:02:11.000000000 +0000
@@ -61,7 +61,7 @@
      *
      * @param parent
      */
-    explicit ObexManager(QObject *parent = Q_NULLPTR);
+    explicit ObexManager(QObject *parent = nullptr);
 
     /**
      * Destroys an ObexManager object.
diff -Nru bluez-qt-5.30.0/src/obexmanager_p.cpp bluez-qt-5.31.0/src/obexmanager_p.cpp
--- bluez-qt-5.30.0/src/obexmanager_p.cpp	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/src/obexmanager_p.cpp	2017-02-04 18:02:11.000000000 +0000
@@ -39,9 +39,9 @@
 ObexManagerPrivate::ObexManagerPrivate(ObexManager *q)
     : QObject(q)
     , q(q)
-    , m_obexClient(0)
-    , m_obexAgentManager(0)
-    , m_dbusObjectManager(0)
+    , m_obexClient(nullptr)
+    , m_obexAgentManager(nullptr)
+    , m_dbusObjectManager(nullptr)
     , m_initialized(false)
     , m_obexRunning(false)
     , m_loaded(false)
@@ -181,17 +181,17 @@
     // Delete all other objects
     if (m_obexClient) {
         m_obexClient->deleteLater();
-        m_obexClient = Q_NULLPTR;
+        m_obexClient = nullptr;
     }
 
     if (m_obexAgentManager) {
         m_obexAgentManager->deleteLater();
-        m_obexAgentManager = Q_NULLPTR;
+        m_obexAgentManager = nullptr;
     }
 
     if (m_dbusObjectManager) {
         m_dbusObjectManager->deleteLater();
-        m_dbusObjectManager = Q_NULLPTR;
+        m_dbusObjectManager = nullptr;
     }
 }
 
diff -Nru bluez-qt-5.30.0/src/obexobjectpush.h bluez-qt-5.31.0/src/obexobjectpush.h
--- bluez-qt-5.30.0/src/obexobjectpush.h	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/src/obexobjectpush.h	2017-02-04 18:02:11.000000000 +0000
@@ -53,7 +53,7 @@
      * @param path path of session
      * @param parent
      */
-    explicit ObexObjectPush(const QDBusObjectPath &path, QObject *parent = Q_NULLPTR);
+    explicit ObexObjectPush(const QDBusObjectPath &path, QObject *parent = nullptr);
 
     /**
      * Destroys an ObexObjectPush object.
diff -Nru bluez-qt-5.30.0/src/obextransfer.cpp bluez-qt-5.31.0/src/obextransfer.cpp
--- bluez-qt-5.30.0/src/obextransfer.cpp	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/src/obextransfer.cpp	2017-02-04 18:02:11.000000000 +0000
@@ -49,7 +49,7 @@
 
 ObexTransferPrivate::ObexTransferPrivate(const QString &path, const QVariantMap &properties)
     : QObject()
-    , m_dbusProperties(0)
+    , m_dbusProperties(nullptr)
     , m_status(ObexTransfer::Error)
     , m_time(0)
     , m_size(0)
diff -Nru bluez-qt-5.30.0/src/pendingcall.cpp bluez-qt-5.31.0/src/pendingcall.cpp
--- bluez-qt-5.30.0/src/pendingcall.cpp	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/src/pendingcall.cpp	2017-02-04 18:02:11.000000000 +0000
@@ -105,7 +105,7 @@
     , q(parent)
     , m_error(PendingCall::NoError)
     , m_type(PendingCall::ReturnVoid)
-    , m_watcher(0)
+    , m_watcher(nullptr)
 {
 }
 
@@ -208,7 +208,7 @@
 void PendingCallPrivate::emitFinished()
 {
     m_watcher->deleteLater();
-    m_watcher = Q_NULLPTR;
+    m_watcher = nullptr;
     Q_EMIT q->finished(q);
     q->deleteLater();
 }
diff -Nru bluez-qt-5.30.0/src/pendingcall.h bluez-qt-5.31.0/src/pendingcall.h
--- bluez-qt-5.30.0/src/pendingcall.h	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/src/pendingcall.h	2017-02-04 18:02:11.000000000 +0000
@@ -181,8 +181,8 @@
         ReturnTransferWithProperties
     };
 
-    explicit PendingCall(const QDBusPendingCall &call, ReturnType type, QObject *parent = Q_NULLPTR);
-    explicit PendingCall(Error error, const QString &errorText, QObject *parent = Q_NULLPTR);
+    explicit PendingCall(const QDBusPendingCall &call, ReturnType type, QObject *parent = nullptr);
+    explicit PendingCall(Error error, const QString &errorText, QObject *parent = nullptr);
 
     class PendingCallPrivate *const d;
 
diff -Nru bluez-qt-5.30.0/src/profile.h bluez-qt-5.31.0/src/profile.h
--- bluez-qt-5.30.0/src/profile.h	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/src/profile.h	2017-02-04 18:02:11.000000000 +0000
@@ -76,7 +76,7 @@
      *
      * @param parent
      */
-    explicit Profile(QObject *parent = Q_NULLPTR);
+    explicit Profile(QObject *parent = nullptr);
 
     /**
      * Destroys a Profile object.
diff -Nru bluez-qt-5.30.0/src/rfkill.h bluez-qt-5.31.0/src/rfkill.h
--- bluez-qt-5.30.0/src/rfkill.h	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/src/rfkill.h	2017-02-04 18:02:11.000000000 +0000
@@ -41,7 +41,7 @@
         Unknown = 3
     };
 
-    explicit Rfkill(QObject *parent = Q_NULLPTR);
+    explicit Rfkill(QObject *parent = nullptr);
     ~Rfkill();
 
     State state() const;
diff -Nru bluez-qt-5.30.0/tests/adaptersreceiver.h bluez-qt-5.31.0/tests/adaptersreceiver.h
--- bluez-qt-5.30.0/tests/adaptersreceiver.h	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/tests/adaptersreceiver.h	2017-02-04 18:02:11.000000000 +0000
@@ -32,7 +32,7 @@
     Q_OBJECT
 
 public:
-    explicit AdaptersReceiver(BluezQt::Manager *manager, QObject *parent = Q_NULLPTR);
+    explicit AdaptersReceiver(BluezQt::Manager *manager, QObject *parent = nullptr);
 
 public Q_SLOTS:
     void adapterAdded(const BluezQt::AdapterPtr &adapter);
diff -Nru bluez-qt-5.30.0/tests/devicereceiver.cpp bluez-qt-5.31.0/tests/devicereceiver.cpp
--- bluez-qt-5.30.0/tests/devicereceiver.cpp	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/tests/devicereceiver.cpp	2017-02-04 18:02:11.000000000 +0000
@@ -33,7 +33,7 @@
 
 using namespace BluezQt;
 
-Manager *g_manager = Q_NULLPTR;
+Manager *g_manager = nullptr;
 
 DeviceReceiver::DeviceReceiver(QObject *parent)
     : QObject(parent)
diff -Nru bluez-qt-5.30.0/tests/devicereceiver.h bluez-qt-5.31.0/tests/devicereceiver.h
--- bluez-qt-5.30.0/tests/devicereceiver.h	2017-01-08 15:12:35.000000000 +0000
+++ bluez-qt-5.31.0/tests/devicereceiver.h	2017-02-04 18:02:11.000000000 +0000
@@ -32,7 +32,7 @@
     Q_OBJECT
 
 public:
-    explicit DeviceReceiver(QObject *parent = Q_NULLPTR);
+    explicit DeviceReceiver(QObject *parent = nullptr);
 
     void scanDevices();