Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package bluez-qt for openSUSE:Factory checked in at 2022-01-11 21:15:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bluez-qt (Old) and /work/SRC/openSUSE:Factory/.bluez-qt.new.1892 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bluez-qt" Tue Jan 11 21:15:51 2022 rev:85 rq:945025 version:5.90.0 Changes: -------- --- /work/SRC/openSUSE:Factory/bluez-qt/bluez-qt.changes 2021-12-13 20:42:24.828470507 +0100 +++ /work/SRC/openSUSE:Factory/.bluez-qt.new.1892/bluez-qt.changes 2022-01-11 21:17:13.924872839 +0100 @@ -1,0 +2,12 @@ +Mon Jan 3 12:47:09 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 5.90.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.90.0 +- Changes since 5.89.0: + * Expose missing services to QML + * Convert all Qt5 to Qt${...} + fix compile error + * Fix compile against qt6 + +------------------------------------------------------------------- Old: ---- bluez-qt-5.89.0.tar.xz bluez-qt-5.89.0.tar.xz.sig New: ---- bluez-qt-5.90.0.tar.xz bluez-qt-5.90.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluez-qt.spec ++++++ --- /var/tmp/diff_new_pack.XSDBvM/_old 2022-01-11 21:17:14.476873227 +0100 +++ /var/tmp/diff_new_pack.XSDBvM/_new 2022-01-11 21:17:14.480873230 +0100 @@ -18,22 +18,22 @@ %define sonum 6 %define _libname KF5BluezQt -%define _tar_path 5.89 +%define _tar_path 5.90 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} # Only needed for the package signature condition -%bcond_without lang +%bcond_without released Name: bluez-qt -Version: 5.89.0 +Version: 5.90.0 Release: 0 Summary: Async Bluez wrapper library License: LGPL-2.1-or-later Group: System/GUI/KDE URL: https://www.kde.org Source: %{name}-%{version}.tar.xz -%if %{with lang} +%if %{with released} Source1: %{name}-%{version}.tar.xz.sig Source2: frameworks.keyring %endif ++++++ bluez-qt-5.89.0.tar.xz -> bluez-qt-5.90.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-qt-5.89.0/CMakeLists.txt new/bluez-qt-5.90.0/CMakeLists.txt --- old/bluez-qt-5.89.0/CMakeLists.txt 2021-12-04 17:55:11.000000000 +0100 +++ new/bluez-qt-5.90.0/CMakeLists.txt 2022-01-01 13:10:33.000000000 +0100 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.89.0") # handled by release scripts +set(KF_VERSION "5.90.0") # handled by release scripts project(BluezQt VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.89.0 NO_MODULE) +find_package(ECM 5.90.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) @@ -39,16 +39,16 @@ # Dependencies set(REQUIRED_QT_VERSION 5.15.2) -# Required Qt5 components to build this framework -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core DBus Network) +# Required Qt components to build this framework +find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core DBus Network) -# Optional Qt5 components to build this framework -find_package(Qt5Test ${REQUIRED_QT_VERSION} CONFIG) -set_package_properties(Qt5Test PROPERTIES DESCRIPTION "Autotests for BluezQt" TYPE OPTIONAL) -find_package(Qt5Qml ${REQUIRED_QT_VERSION} CONFIG) -set_package_properties(Qt5Qml PROPERTIES DESCRIPTION "QML support for BluezQt" TYPE OPTIONAL) -find_package(Qt5QuickTest ${REQUIRED_QT_VERSION} CONFIG) -set_package_properties(Qt5QuickTest PROPERTIES DESCRIPTION "QML autotests for BluezQt" TYPE OPTIONAL) +# Optional Qt components to build this framework +find_package(Qt${QT_MAJOR_VERSION}Test ${REQUIRED_QT_VERSION} CONFIG) +set_package_properties(Qt${QT_MAJOR_VERSION}Test PROPERTIES DESCRIPTION "Autotests for BluezQt" TYPE OPTIONAL) +find_package(Qt${QT_MAJOR_VERSION}Qml ${REQUIRED_QT_VERSION} CONFIG) +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) # Subdirectories add_subdirectory(src) @@ -56,12 +56,12 @@ if (BUILD_TESTING) add_subdirectory(tests) - if(Qt5Test_FOUND) + if(Qt${QT_MAJOR_VERSION}Test_FOUND) add_subdirectory(autotests) endif() endif() -if(Qt5Qml_FOUND) +if(Qt${QT_MAJOR_VERSION}Qml_FOUND) add_subdirectory(src/imports) endif() @@ -97,7 +97,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/bluezqt_version.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF} COMPONENT Devel) if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") @@ -109,8 +109,8 @@ endif() ecm_generate_pkgconfig_file(BASE_NAME KF5BluezQt - INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/BluezQt/ - DEPS "Qt5Core Qt5Network Qt5DBus" + INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/BluezQt/ + DEPS "Qt${QT_MAJOR_VERSION}Core Qt${QT_MAJOR_VERSION}Network Qt${QT_MAJOR_VERSION}DBus" INSTALL) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-qt-5.89.0/KF5BluezQtConfig.cmake.in new/bluez-qt-5.90.0/KF5BluezQtConfig.cmake.in --- old/bluez-qt-5.89.0/KF5BluezQtConfig.cmake.in 2021-12-04 17:55:11.000000000 +0100 +++ new/bluez-qt-5.90.0/KF5BluezQtConfig.cmake.in 2022-01-01 13:10:33.000000000 +0100 @@ -1,7 +1,7 @@ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) -find_dependency(Qt5Core @REQUIRED_QT_VERSION@) +find_dependency(Qt@QT_MAJOR_VERSION@Core @REQUIRED_QT_VERSION@) include("${CMAKE_CURRENT_LIST_DIR}/KF5BluezQtTargets.cmake") @PACKAGE_INCLUDE_QCHTARGETS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-qt-5.89.0/autotests/CMakeLists.txt new/bluez-qt-5.90.0/autotests/CMakeLists.txt --- old/bluez-qt-5.89.0/autotests/CMakeLists.txt 2021-12-04 17:55:11.000000000 +0100 +++ new/bluez-qt-5.90.0/autotests/CMakeLists.txt 2022-01-01 13:10:33.000000000 +0100 @@ -20,7 +20,7 @@ macro(bluezqt_tests) foreach(_testname ${ARGN}) add_executable(${_testname} ${_testname}.cpp ${bluezqt_autotests_SRCS}) - target_link_libraries(${_testname} Qt5::DBus Qt5::Test KF5BluezQt) + target_link_libraries(${_testname} Qt${QT_MAJOR_VERSION}::DBus Qt${QT_MAJOR_VERSION}::Test KF5BluezQt) add_test(NAME bluezqt-${_testname} COMMAND ${_testname}) ecm_mark_as_test(${_testname}) set_tests_properties(bluezqt-${_testname} PROPERTIES RUN_SERIAL TRUE) @@ -46,8 +46,8 @@ gattmanagertest ) -if(Qt5Qml_FOUND AND Qt5QuickTest_FOUND) +if(Qt${QT_MAJOR_VERSION}Qml_FOUND AND Qt${QT_MAJOR_VERSION}QuickTest_FOUND) bluezqt_tests(qmltests) - target_link_libraries(qmltests Qt5::Qml Qt5::QuickTest) + target_link_libraries(qmltests Qt${QT_MAJOR_VERSION}::Qml Qt${QT_MAJOR_VERSION}::QuickTest) add_definitions(-DBLUEZQT_QML_IMPORT_PATH="${CMAKE_CURRENT_BINARY_DIR}/../src/imports") endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-qt-5.89.0/autotests/fakebluez/CMakeLists.txt new/bluez-qt-5.90.0/autotests/fakebluez/CMakeLists.txt --- old/bluez-qt-5.89.0/autotests/fakebluez/CMakeLists.txt 2021-12-04 17:55:11.000000000 +0100 +++ new/bluez-qt-5.90.0/autotests/fakebluez/CMakeLists.txt 2022-01-01 13:10:33.000000000 +0100 @@ -26,6 +26,6 @@ add_executable(fakebluez ${fakebluez_SRCS}) target_link_libraries(fakebluez - Qt5::Core - Qt5::DBus + Qt${QT_MAJOR_VERSION}::Core + Qt${QT_MAJOR_VERSION}::DBus ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-qt-5.89.0/src/CMakeLists.txt new/bluez-qt-5.90.0/src/CMakeLists.txt --- old/bluez-qt-5.89.0/src/CMakeLists.txt 2021-12-04 17:55:11.000000000 +0100 +++ new/bluez-qt-5.90.0/src/CMakeLists.txt 2022-01-01 13:10:33.000000000 +0100 @@ -111,14 +111,14 @@ EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) -target_include_directories(KF5BluezQt INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/BluezQt>") +target_include_directories(KF5BluezQt INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/BluezQt>") target_link_libraries(KF5BluezQt PUBLIC - Qt5::Core + Qt${QT_MAJOR_VERSION}::Core PRIVATE - Qt5::DBus - Qt5::Network + Qt${QT_MAJOR_VERSION}::DBus + Qt${QT_MAJOR_VERSION}::Network ) set_target_properties(KF5BluezQt @@ -179,13 +179,13 @@ install(FILES ${BluezQt_CamelCase_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/BluezQt/BluezQt + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/BluezQt/BluezQt COMPONENT Devel) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/bluezqt_export.h ${BluezQt_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/BluezQt/bluezqt + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/BluezQt/bluezqt COMPONENT Devel) ecm_qt_install_logging_categories( @@ -206,7 +206,7 @@ ${BluezQt_HEADERS} MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md" LINK_QCHS - Qt5Core_QCH + Qt${QT_MAJOR_VERSION}Core_QCH INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR} BLANK_MACROS @@ -227,7 +227,7 @@ LIB_NAME KF5BluezQt DEPS "core" FILENAME_VAR PRI_FILENAME - INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/BluezQt + INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/BluezQt ) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-qt-5.89.0/src/device.h new/bluez-qt-5.90.0/src/device.h --- old/bluez-qt-5.89.0/src/device.h 2021-12-04 17:55:11.000000000 +0100 +++ new/bluez-qt-5.90.0/src/device.h 2022-01-01 13:10:33.000000000 +0100 @@ -12,10 +12,10 @@ #include <QObject> #include "bluezqt_export.h" +#include "gattserviceremote.h" #include "input.h" #include "mediaplayer.h" #include "mediatransport.h" - namespace BluezQt { class Adapter; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-qt-5.89.0/src/gattcharacteristicremote.h new/bluez-qt-5.90.0/src/gattcharacteristicremote.h --- old/bluez-qt-5.89.0/src/gattcharacteristicremote.h 2021-12-04 17:55:11.000000000 +0100 +++ new/bluez-qt-5.90.0/src/gattcharacteristicremote.h 2022-01-01 13:10:33.000000000 +0100 @@ -9,12 +9,12 @@ #ifndef BLUEZQT_GATTCHARACTERISTICREMOTE_H #define BLUEZQT_GATTCHARACTERISTICREMOTE_H -#include <QObject> -#include <QMap> - -#include "types.h" #include "bluezqt_export.h" - +#include "gattdescriptorremote.h" +#include "types.h" +#include <QList> +#include <QMap> +#include <QObject> namespace BluezQt { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-qt-5.89.0/src/imports/CMakeLists.txt new/bluez-qt-5.90.0/src/imports/CMakeLists.txt --- old/bluez-qt-5.89.0/src/imports/CMakeLists.txt 2021-12-04 17:55:11.000000000 +0100 +++ new/bluez-qt-5.90.0/src/imports/CMakeLists.txt 2022-01-01 13:10:33.000000000 +0100 @@ -16,9 +16,9 @@ add_library(bluezqtextensionplugin SHARED ${bluezqtextensionplugin_SRCS}) target_link_libraries(bluezqtextensionplugin - Qt5::Core - Qt5::Qml - Qt5::DBus + Qt${QT_MAJOR_VERSION}::Core + Qt${QT_MAJOR_VERSION}::Qml + Qt${QT_MAJOR_VERSION}::DBus KF5::BluezQt ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-qt-5.89.0/src/imports/bluezqtextensionplugin.cpp new/bluez-qt-5.90.0/src/imports/bluezqtextensionplugin.cpp --- old/bluez-qt-5.89.0/src/imports/bluezqtextensionplugin.cpp 2021-12-04 17:55:11.000000000 +0100 +++ new/bluez-qt-5.90.0/src/imports/bluezqtextensionplugin.cpp 2022-01-01 13:10:33.000000000 +0100 @@ -41,6 +41,7 @@ object.setProperty(QStringLiteral("ObexFileTransfer"), BluezQt::Services::ObexFileTransfer); object.setProperty(QStringLiteral("Headset"), BluezQt::Services::Headset); object.setProperty(QStringLiteral("AudioSource"), BluezQt::Services::AudioSource); + object.setProperty(QStringLiteral("AudioSink"), BluezQt::Services::AudioSink); object.setProperty(QStringLiteral("AudioVideoRemoteControlTarget"), BluezQt::Services::AudioVideoRemoteControlTarget); object.setProperty(QStringLiteral("AdvancedAudioDistribution"), BluezQt::Services::AdvancedAudioDistribution); object.setProperty(QStringLiteral("AudioVideoRemoteControl"), BluezQt::Services::AudioVideoRemoteControl); @@ -54,6 +55,12 @@ 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("GenericAttribute"), BluezQt::Services::GenericAttribute); + object.setProperty(QStringLiteral("ImmediateAlert"), BluezQt::Services::ImmediateAlert); + object.setProperty(QStringLiteral("LinkLoss"), BluezQt::Services::LinkLoss); + object.setProperty(QStringLiteral("TxPower"), BluezQt::Services::TxPower); + object.setProperty(QStringLiteral("HeartRate"), BluezQt::Services::HeartRate); return object; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-qt-5.89.0/src/imports/declarativeadapter.cpp new/bluez-qt-5.90.0/src/imports/declarativeadapter.cpp --- old/bluez-qt-5.89.0/src/imports/declarativeadapter.cpp 2021-12-04 17:55:11.000000000 +0100 +++ new/bluez-qt-5.90.0/src/imports/declarativeadapter.cpp 2022-01-01 13:10:33.000000000 +0100 @@ -8,8 +8,11 @@ #include "declarativeadapter.h" #include "declarativedevice.h" - +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +static qsizetype devicesCountDeclarativeAdapterFunction(QQmlListProperty<DeclarativeDevice> *property) +#else static int devicesCountDeclarativeAdapterFunction(QQmlListProperty<DeclarativeDevice> *property) +#endif { Q_ASSERT(qobject_cast<DeclarativeAdapter *>(property->object)); DeclarativeAdapter *adapter = static_cast<DeclarativeAdapter *>(property->object); @@ -17,7 +20,11 @@ return adapter->m_devices.count(); } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +static DeclarativeDevice *devicesAtDeclarativeAdapterFunction(QQmlListProperty<DeclarativeDevice> *property, qsizetype index) +#else static DeclarativeDevice *devicesAtDeclarativeAdapterFunction(QQmlListProperty<DeclarativeDevice> *property, int index) +#endif { Q_ASSERT(qobject_cast<DeclarativeAdapter *>(property->object)); DeclarativeAdapter *adapter = static_cast<DeclarativeAdapter *>(property->object); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-qt-5.89.0/src/imports/declarativemanager.cpp new/bluez-qt-5.90.0/src/imports/declarativemanager.cpp --- old/bluez-qt-5.89.0/src/imports/declarativemanager.cpp 2021-12-04 17:55:11.000000000 +0100 +++ new/bluez-qt-5.90.0/src/imports/declarativemanager.cpp 2022-01-01 13:10:33.000000000 +0100 @@ -12,8 +12,11 @@ #include "declarativedevice.h" #include "device.h" #include "initmanagerjob.h" - +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +static qsizetype adaptersCountFunction(QQmlListProperty<DeclarativeAdapter> *property) +#else static int adaptersCountFunction(QQmlListProperty<DeclarativeAdapter> *property) +#endif { Q_ASSERT(qobject_cast<DeclarativeManager *>(property->object)); DeclarativeManager *manager = static_cast<DeclarativeManager *>(property->object); @@ -21,7 +24,11 @@ return manager->m_adapters.count(); } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +static DeclarativeAdapter *adaptersAtFunction(QQmlListProperty<DeclarativeAdapter> *property, qsizetype index) +#else static DeclarativeAdapter *adaptersAtFunction(QQmlListProperty<DeclarativeAdapter> *property, int index) +#endif { Q_ASSERT(qobject_cast<DeclarativeManager *>(property->object)); DeclarativeManager *manager = static_cast<DeclarativeManager *>(property->object); @@ -29,7 +36,11 @@ return manager->m_adapters.values().at(index); } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +static qsizetype devicesCountFunction(QQmlListProperty<DeclarativeDevice> *property) +#else static int devicesCountFunction(QQmlListProperty<DeclarativeDevice> *property) +#endif { Q_ASSERT(qobject_cast<DeclarativeManager *>(property->object)); DeclarativeManager *manager = static_cast<DeclarativeManager *>(property->object); @@ -37,7 +48,11 @@ return manager->m_devices.count(); } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +static DeclarativeDevice *devicesAtFunction(QQmlListProperty<DeclarativeDevice> *property, qsizetype index) +#else static DeclarativeDevice *devicesAtFunction(QQmlListProperty<DeclarativeDevice> *property, int index) +#endif { Q_ASSERT(qobject_cast<DeclarativeManager *>(property->object)); DeclarativeManager *manager = static_cast<DeclarativeManager *>(property->object); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-qt-5.89.0/src/tpendingcall.h new/bluez-qt-5.90.0/src/tpendingcall.h --- old/bluez-qt-5.89.0/src/tpendingcall.h 2021-12-04 17:55:11.000000000 +0100 +++ new/bluez-qt-5.90.0/src/tpendingcall.h 2022-01-01 13:10:33.000000000 +0100 @@ -55,7 +55,11 @@ inline const typename Select<Index, T...>::Type valueAt() const { using ResultType = typename Select<Index, T...>::Type; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + return qdbus_cast<ResultType>(m_reply.argumentAt(Index)); +#else return qdbus_cast<ResultType>(m_reply.argumentAt(Index), nullptr); +#endif } private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-qt-5.89.0/tests/CMakeLists.txt new/bluez-qt-5.90.0/tests/CMakeLists.txt --- old/bluez-qt-5.89.0/tests/CMakeLists.txt 2021-12-04 17:55:11.000000000 +0100 +++ new/bluez-qt-5.90.0/tests/CMakeLists.txt 2022-01-01 13:10:33.000000000 +0100 @@ -3,7 +3,7 @@ macro(bluezqt_executable_tests) foreach(_testname ${ARGN}) add_executable(${_testname} ${_testname}.cpp) - target_link_libraries(${_testname} Qt5::DBus Qt5::Network Qt5::Test KF5BluezQt) + target_link_libraries(${_testname} Qt${QT_MAJOR_VERSION}::DBus Qt${QT_MAJOR_VERSION}::Network Qt${QT_MAJOR_VERSION}::Test KF5BluezQt) ecm_mark_as_test(${_testname}) endforeach(_testname) endmacro() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-qt-5.89.0/tools/bluezapi2qt/CMakeLists.txt new/bluez-qt-5.90.0/tools/bluezapi2qt/CMakeLists.txt --- old/bluez-qt-5.89.0/tools/bluezapi2qt/CMakeLists.txt 2021-12-04 17:55:11.000000000 +0100 +++ new/bluez-qt-5.90.0/tools/bluezapi2qt/CMakeLists.txt 2022-01-01 13:10:33.000000000 +0100 @@ -14,5 +14,5 @@ ) target_link_libraries(bluezapi2qt - Qt5::Core + Qt${QT_MAJOR_VERSION}::Core ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-qt-5.89.0/tools/bluezapi2qt/Comment.cpp new/bluez-qt-5.90.0/tools/bluezapi2qt/Comment.cpp --- old/bluez-qt-5.89.0/tools/bluezapi2qt/Comment.cpp 2021-12-04 17:55:11.000000000 +0100 +++ new/bluez-qt-5.90.0/tools/bluezapi2qt/Comment.cpp 2022-01-01 13:10:33.000000000 +0100 @@ -16,7 +16,11 @@ } // Find indents +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + qsizetype indents = 255; +#else int indents = 255; +#endif for (const auto &line : *this) { if (line.isEmpty()) { continue;
