diff -Nru bluez-qt-5.92.0/autotests/managertest.cpp bluez-qt-5.98.0/autotests/managertest.cpp --- bluez-qt-5.92.0/autotests/managertest.cpp 2022-03-05 11:09:12.000000000 +0000 +++ bluez-qt-5.98.0/autotests/managertest.cpp 2022-09-05 09:21:27.000000000 +0000 @@ -38,7 +38,7 @@ { // org.bluez is not running at all // expected: init successful - Manager *manager = new Manager; + auto manager = std::make_unique(); InitManagerJob *job = manager->init(); job->exec(); @@ -46,8 +46,6 @@ QVERIFY(manager->isInitialized()); QVERIFY(!manager->isOperational()); QVERIFY(!manager->isBluetoothOperational()); - - delete manager; } void ManagerTest::bluezNotExportingInterfacesTest() @@ -57,7 +55,7 @@ FakeBluez::start(); FakeBluez::runTest(QStringLiteral("bluez-not-exporting-interfaces")); - Manager *manager = new Manager; + auto manager = std::make_unique(); InitManagerJob *job = manager->init(); job->exec(); @@ -65,8 +63,6 @@ QVERIFY(!manager->isInitialized()); QVERIFY(!manager->isOperational()); QVERIFY(!manager->isBluetoothOperational()); - - delete manager; } void ManagerTest::bluezEmptyManagedObjectsTest() @@ -76,7 +72,7 @@ FakeBluez::start(); FakeBluez::runTest(QStringLiteral("bluez-empty-managed-objects")); - Manager *manager = new Manager; + auto manager = std::make_unique(); InitManagerJob *job = manager->init(); job->exec(); @@ -84,8 +80,6 @@ QVERIFY(!manager->isInitialized()); QVERIFY(!manager->isOperational()); QVERIFY(!manager->isBluetoothOperational()); - - delete manager; } void ManagerTest::bluezNoAdaptersTest() @@ -95,7 +89,7 @@ FakeBluez::start(); FakeBluez::runTest(QStringLiteral("bluez-no-adapters")); - Manager *manager = new Manager; + auto manager = std::make_unique(); InitManagerJob *job = manager->init(); job->exec(); @@ -103,8 +97,6 @@ QVERIFY(manager->isInitialized()); QVERIFY(manager->isOperational()); QVERIFY(!manager->isBluetoothOperational()); - - delete manager; } void ManagerTest::bluezShutdownTest() @@ -143,9 +135,9 @@ deviceProps[QStringLiteral("Name")] = QStringLiteral("TestDevice2"); FakeBluez::runAction(QStringLiteral("devicemanager"), QStringLiteral("create-device"), deviceProps); - Manager *manager = new Manager; + auto manager = std::make_unique(); - QSignalSpy btOperationalChangedSpy(manager, SIGNAL(bluetoothOperationalChanged(bool))); + QSignalSpy btOperationalChangedSpy(manager.get(), SIGNAL(bluetoothOperationalChanged(bool))); InitManagerJob *job = manager->init(); job->exec(); @@ -170,8 +162,8 @@ QVERIFY(device1); QVERIFY(device2); - QSignalSpy allAdaptersRemovedSpy(manager, SIGNAL(allAdaptersRemoved())); - QSignalSpy adapterRemovedSpy(manager, SIGNAL(adapterRemoved(AdapterPtr))); + QSignalSpy allAdaptersRemovedSpy(manager.get(), SIGNAL(allAdaptersRemoved())); + QSignalSpy adapterRemovedSpy(manager.get(), SIGNAL(adapterRemoved(AdapterPtr))); QSignalSpy device1RemovedSpy(adapter1.data(), SIGNAL(deviceRemoved(DevicePtr))); QSignalSpy device2RemovedSpy(adapter2.data(), SIGNAL(deviceRemoved(DevicePtr))); @@ -187,8 +179,6 @@ QCOMPARE(btOperationalChangedSpy.count(), 1); QCOMPARE(btOperationalChangedSpy.first().first().toBool(), false); - - delete manager; } void ManagerTest::usableAdapterTest() @@ -212,9 +202,9 @@ adapterProps[QStringLiteral("Powered")] = false; FakeBluez::runAction(QStringLiteral("devicemanager"), QStringLiteral("create-adapter"), adapterProps); - Manager *manager = new Manager; + auto manager = std::make_unique(); - QSignalSpy usableAdapterChangedSpy(manager, SIGNAL(usableAdapterChanged(AdapterPtr))); + QSignalSpy usableAdapterChangedSpy(manager.get(), SIGNAL(usableAdapterChanged(AdapterPtr))); InitManagerJob *job = manager->init(); job->exec(); @@ -252,8 +242,6 @@ QTRY_COMPARE(usableAdapterChangedSpy.count(), 1); QCOMPARE(manager->usableAdapter()->ubi(), adapter2path.path()); - - delete manager; } void ManagerTest::deviceForAddressTest() @@ -291,7 +279,7 @@ deviceProps[QStringLiteral("Adapter")] = QVariant::fromValue(adapter2path); FakeBluez::runAction(QStringLiteral("devicemanager"), QStringLiteral("create-device"), deviceProps); - Manager *manager = new Manager; + auto manager = std::make_unique(); InitManagerJob *job = manager->init(); job->exec(); @@ -331,8 +319,6 @@ QTRY_COMPARE(adapter1Spy.count(), 2); QVERIFY(manager->deviceForAddress(address)); - - delete manager; } void ManagerTest::adapterWithDevicesRemovedTest() @@ -365,7 +351,7 @@ deviceProps[QStringLiteral("Name")] = QStringLiteral("TestDevice2"); FakeBluez::runAction(QStringLiteral("devicemanager"), QStringLiteral("create-device"), deviceProps); - Manager *manager = new Manager; + auto manager = std::make_unique(); InitManagerJob *job = manager->init(); job->exec(); @@ -380,8 +366,8 @@ QVERIFY(device1); QVERIFY(device2); - QSignalSpy adapterRemovedSpy(manager, SIGNAL(adapterRemoved(AdapterPtr))); - QSignalSpy deviceRemovedSpy(manager, SIGNAL(deviceRemoved(DevicePtr))); + QSignalSpy adapterRemovedSpy(manager.get(), SIGNAL(adapterRemoved(AdapterPtr))); + QSignalSpy deviceRemovedSpy(manager.get(), SIGNAL(deviceRemoved(DevicePtr))); QVariantMap properties; properties[QStringLiteral("Path")] = QVariant::fromValue(adapter1path); @@ -392,8 +378,6 @@ QCOMPARE(manager->adapters().count(), 0); QCOMPARE(manager->devices().count(), 0); QCOMPARE(adapter->devices().count(), 0); - - delete manager; } void ManagerTest::bug364416() @@ -403,7 +387,7 @@ FakeBluez::start(); FakeBluez::runTest(QStringLiteral("bluez-standard")); - Manager *manager = new Manager; + auto manager = std::make_unique(); InitManagerJob *job = manager->init(); job->exec(); @@ -420,8 +404,6 @@ // Wait for Manager to receive the interfacesAdded signal QTest::qWait(100); - - delete manager; } void ManagerTest::bug377405() @@ -431,7 +413,7 @@ FakeBluez::start(); FakeBluez::runTest(QStringLiteral("bluez-standard")); - Manager *manager = new Manager; + auto manager = std::make_unique(); InitManagerJob *job = manager->init(); job->exec(); diff -Nru bluez-qt-5.92.0/CMakeLists.txt bluez-qt-5.98.0/CMakeLists.txt --- bluez-qt-5.92.0/CMakeLists.txt 2022-03-05 11:09:12.000000000 +0000 +++ bluez-qt-5.98.0/CMakeLists.txt 2022-09-05 09:21:27.000000000 +0000 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.92.0") # handled by release scripts +set(KF_VERSION "5.98.0") # handled by release scripts project(BluezQt VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.92.0 NO_MODULE) +find_package(ECM 5.98.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -24,6 +24,7 @@ include(ECMQtDeclareLoggingCategory) include(ECMGeneratePkgConfigFile) include(ECMQmlModule) +include(ECMDeprecationSettings) set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprecated API excluded from the build [default=0].") @@ -50,7 +51,11 @@ set_package_properties(Qt${QT_MAJOR_VERSION}Qml PROPERTIES DESCRIPTION "QML support for BluezQt" TYPE OPTIONAL) find_package(Qt${QT_MAJOR_VERSION}QuickTest ${REQUIRED_QT_VERSION} CONFIG) set_package_properties(Qt${QT_MAJOR_VERSION}QuickTest PROPERTIES DESCRIPTION "QML autotests for BluezQt" TYPE OPTIONAL) -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) + +ecm_set_disabled_deprecation_versions( + QT 5.15.2 +) + # Subdirectories add_subdirectory(src) add_subdirectory(tools/bluezapi2qt) diff -Nru bluez-qt-5.92.0/debian/changelog bluez-qt-5.98.0/debian/changelog --- bluez-qt-5.92.0/debian/changelog 2022-03-16 16:24:56.000000000 +0000 +++ bluez-qt-5.98.0/debian/changelog 2022-09-05 13:33:14.000000000 +0000 @@ -1,3 +1,40 @@ +bluez-qt (5.98.0-0ubuntu1~ubuntu22.04~ppa1) jammy; urgency=high + + * New upstream release (5.98.0) + + -- Rik Mills Mon, 05 Sep 2022 14:33:14 +0100 + +bluez-qt (5.97.0-0ubuntu1) kinetic; urgency=medium + + * New upstream release (5.97.0) + + -- Rik Mills Sat, 13 Aug 2022 14:01:58 +0100 + +bluez-qt (5.96.0-0ubuntu1) kinetic; urgency=medium + + * New upstream release (5.96.0) + + -- Rik Mills Sat, 09 Jul 2022 16:28:02 +0100 + +bluez-qt (5.95.0-0ubuntu1) kinetic; urgency=medium + + * New upstream release (5.95.0) + + -- Rik Mills Sat, 11 Jun 2022 09:53:14 +0100 + +bluez-qt (5.94.0-0ubuntu1) kinetic; urgency=medium + + * New upstream release (5.94.0) + * Disable acc test. + + -- Rik Mills Thu, 12 May 2022 16:17:00 +0100 + +bluez-qt (5.93.0-0ubuntu1) kinetic; urgency=medium + + * New upstream release (5.93.0) + + -- Rik Mills Fri, 29 Apr 2022 08:20:33 +0100 + bluez-qt (5.92.0-0ubuntu1) jammy; urgency=medium * New upstream release (5.92.0) diff -Nru bluez-qt-5.92.0/debian/control bluez-qt-5.98.0/debian/control --- bluez-qt-5.92.0/debian/control 2022-03-16 16:24:56.000000000 +0000 +++ bluez-qt-5.98.0/debian/control 2022-09-05 13:33:14.000000000 +0000 @@ -8,7 +8,7 @@ dbus-x11, debhelper-compat (= 13), doxygen, - extra-cmake-modules (>= 5.92.0~), + extra-cmake-modules (>= 5.98.0~), libqt5sql5-sqlite, pkg-kde-tools (>> 0.15.15), qml-module-qttest, diff -Nru bluez-qt-5.92.0/debian/tests/control bluez-qt-5.98.0/debian/tests/control --- bluez-qt-5.92.0/debian/tests/control 2022-03-16 16:24:56.000000000 +0000 +++ bluez-qt-5.98.0/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -Tests: acc -Depends: dh-acc, exuberant-ctags, @ -Restrictions: allow-stderr diff -Nru bluez-qt-5.92.0/debian/tests/control.disabled bluez-qt-5.98.0/debian/tests/control.disabled --- bluez-qt-5.92.0/debian/tests/control.disabled 1970-01-01 00:00:00.000000000 +0000 +++ bluez-qt-5.98.0/debian/tests/control.disabled 2022-09-05 13:33:14.000000000 +0000 @@ -0,0 +1,3 @@ +Tests: acc +Depends: dh-acc, exuberant-ctags, @ +Restrictions: allow-stderr diff -Nru bluez-qt-5.92.0/.kde-ci.yml bluez-qt-5.98.0/.kde-ci.yml --- bluez-qt-5.92.0/.kde-ci.yml 2022-03-05 11:09:12.000000000 +0000 +++ bluez-qt-5.98.0/.kde-ci.yml 2022-09-05 09:21:27.000000000 +0000 @@ -5,3 +5,4 @@ Options: test-before-installing: True + require-passing-tests-on: [ 'Linux' ] diff -Nru bluez-qt-5.92.0/src/imports/bluezqtextensionplugin.cpp bluez-qt-5.98.0/src/imports/bluezqtextensionplugin.cpp --- bluez-qt-5.92.0/src/imports/bluezqtextensionplugin.cpp 2022-03-05 11:09:12.000000000 +0000 +++ bluez-qt-5.98.0/src/imports/bluezqtextensionplugin.cpp 2022-09-05 09:21:27.000000000 +0000 @@ -55,7 +55,8 @@ object.setProperty(QStringLiteral("PhonebookAccessServer"), BluezQt::Services::PhonebookAccessServer); object.setProperty(QStringLiteral("MessageAccessServer"), BluezQt::Services::MessageAccessServer); object.setProperty(QStringLiteral("PnpInformation"), BluezQt::Services::PnpInformation); - object.setProperty(QStringLiteral("GenericAcces"), BluezQt::Services::GenericAcces); + object.setProperty(QStringLiteral("GenericAccess"), BluezQt::Services::GenericAccess); + object.setProperty(QStringLiteral("GenericAcces"), BluezQt::Services::GenericAccess); // TODO KF6: Remove the one with typo object.setProperty(QStringLiteral("GenericAttribute"), BluezQt::Services::GenericAttribute); object.setProperty(QStringLiteral("ImmediateAlert"), BluezQt::Services::ImmediateAlert); object.setProperty(QStringLiteral("LinkLoss"), BluezQt::Services::LinkLoss); diff -Nru bluez-qt-5.92.0/src/services.h bluez-qt-5.98.0/src/services.h --- bluez-qt-5.92.0/src/services.h 2022-03-05 11:09:12.000000000 +0000 +++ bluez-qt-5.98.0/src/services.h 2022-09-05 09:21:27.000000000 +0000 @@ -39,7 +39,8 @@ const QString PnpInformation = QLatin1String("00001200-0000-1000-8000-00805F9B34FB"); // Bluetooth Low Energy -const QString GenericAcces = QLatin1String("00001800-0000-1000-8000-00805f9b34fb"); +const QString GenericAccess = QLatin1String("00001800-0000-1000-8000-00805f9b34fb"); +const QString GenericAcces = GenericAccess; // TODO KF6: Remove the one with typo const QString GenericAttribute = QLatin1String("00001801-0000-1000-8000-00805f9b34fb"); const QString ImmediateAlert = QLatin1String("00001802-0000-1000-8000-00805f9b34fb"); const QString LinkLoss = QLatin1String("00001803-0000-1000-8000-00805f9b34fb");