diff -Nru bluez-qt-5.89.0/autotests/CMakeLists.txt bluez-qt-5.90.0/autotests/CMakeLists.txt --- bluez-qt-5.89.0/autotests/CMakeLists.txt 2021-12-04 16:55:11.000000000 +0000 +++ bluez-qt-5.90.0/autotests/CMakeLists.txt 2022-01-01 12:10:33.000000000 +0000 @@ -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 -Nru bluez-qt-5.89.0/autotests/fakebluez/CMakeLists.txt bluez-qt-5.90.0/autotests/fakebluez/CMakeLists.txt --- bluez-qt-5.89.0/autotests/fakebluez/CMakeLists.txt 2021-12-04 16:55:11.000000000 +0000 +++ bluez-qt-5.90.0/autotests/fakebluez/CMakeLists.txt 2022-01-01 12:10:33.000000000 +0000 @@ -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 -Nru bluez-qt-5.89.0/CMakeLists.txt bluez-qt-5.90.0/CMakeLists.txt --- bluez-qt-5.89.0/CMakeLists.txt 2021-12-04 16:55:11.000000000 +0000 +++ bluez-qt-5.90.0/CMakeLists.txt 2022-01-01 12:10:33.000000000 +0000 @@ -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 -Nru bluez-qt-5.89.0/debian/changelog bluez-qt-5.90.0/debian/changelog --- bluez-qt-5.89.0/debian/changelog 2021-12-05 11:50:32.000000000 +0000 +++ bluez-qt-5.90.0/debian/changelog 2021-12-30 10:31:13.000000000 +0000 @@ -1,9 +1,16 @@ -bluez-qt (5.89.0-0ubuntu1~ubuntu21.10~ppa1) impish; urgency=medium +bluez-qt (5.90.0-0ubuntu1~ubuntu21.10~ppa1) impish; urgency=high + + * New upstream release (5.90.0) + * Update patch disable-failing-qmltests + + -- Rik Mills Thu, 30 Dec 2021 10:31:13 +0000 + +bluez-qt (5.89.0-0ubuntu1) jammy; urgency=medium * New upstream release (5.89.0) * Update symbols - -- José Manuel Santamaría Lema Sun, 05 Dec 2021 12:50:32 +0100 + -- José Manuel Santamaría Lema Sun, 12 Dec 2021 15:14:09 +0000 bluez-qt (5.88.0-1ubuntu2) jammy; urgency=medium diff -Nru bluez-qt-5.89.0/debian/control bluez-qt-5.90.0/debian/control --- bluez-qt-5.89.0/debian/control 2021-12-05 11:50:32.000000000 +0000 +++ bluez-qt-5.90.0/debian/control 2021-12-30 10:31:13.000000000 +0000 @@ -8,7 +8,7 @@ dbus-x11, debhelper-compat (= 13), doxygen, - extra-cmake-modules (>= 5.89.0~), + extra-cmake-modules (>= 5.90.0~), libqt5sql5-sqlite, pkg-kde-tools (>> 0.15.15), qml-module-qttest, diff -Nru bluez-qt-5.89.0/debian/patches/disable-failing-qmltests bluez-qt-5.90.0/debian/patches/disable-failing-qmltests --- bluez-qt-5.89.0/debian/patches/disable-failing-qmltests 2021-12-05 11:50:32.000000000 +0000 +++ bluez-qt-5.90.0/debian/patches/disable-failing-qmltests 2021-12-30 10:31:13.000000000 +0000 @@ -4,17 +4,17 @@ --- a/autotests/CMakeLists.txt +++ b/autotests/CMakeLists.txt -@@ -40,8 +40,8 @@ bluezqt_tests( +@@ -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() -+#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 -Nru bluez-qt-5.89.0/KF5BluezQtConfig.cmake.in bluez-qt-5.90.0/KF5BluezQtConfig.cmake.in --- bluez-qt-5.89.0/KF5BluezQtConfig.cmake.in 2021-12-04 16:55:11.000000000 +0000 +++ bluez-qt-5.90.0/KF5BluezQtConfig.cmake.in 2022-01-01 12:10:33.000000000 +0000 @@ -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 -Nru bluez-qt-5.89.0/src/CMakeLists.txt bluez-qt-5.90.0/src/CMakeLists.txt --- bluez-qt-5.89.0/src/CMakeLists.txt 2021-12-04 16:55:11.000000000 +0000 +++ bluez-qt-5.90.0/src/CMakeLists.txt 2022-01-01 12:10:33.000000000 +0000 @@ -111,14 +111,14 @@ EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) -target_include_directories(KF5BluezQt INTERFACE "$") +target_include_directories(KF5BluezQt INTERFACE "$") 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 -Nru bluez-qt-5.89.0/src/device.h bluez-qt-5.90.0/src/device.h --- bluez-qt-5.89.0/src/device.h 2021-12-04 16:55:11.000000000 +0000 +++ bluez-qt-5.90.0/src/device.h 2022-01-01 12:10:33.000000000 +0000 @@ -12,10 +12,10 @@ #include #include "bluezqt_export.h" +#include "gattserviceremote.h" #include "input.h" #include "mediaplayer.h" #include "mediatransport.h" - namespace BluezQt { class Adapter; diff -Nru bluez-qt-5.89.0/src/gattcharacteristicremote.h bluez-qt-5.90.0/src/gattcharacteristicremote.h --- bluez-qt-5.89.0/src/gattcharacteristicremote.h 2021-12-04 16:55:11.000000000 +0000 +++ bluez-qt-5.90.0/src/gattcharacteristicremote.h 2022-01-01 12:10:33.000000000 +0000 @@ -9,12 +9,12 @@ #ifndef BLUEZQT_GATTCHARACTERISTICREMOTE_H #define BLUEZQT_GATTCHARACTERISTICREMOTE_H -#include -#include - -#include "types.h" #include "bluezqt_export.h" - +#include "gattdescriptorremote.h" +#include "types.h" +#include +#include +#include namespace BluezQt { diff -Nru bluez-qt-5.89.0/src/imports/bluezqtextensionplugin.cpp bluez-qt-5.90.0/src/imports/bluezqtextensionplugin.cpp --- bluez-qt-5.89.0/src/imports/bluezqtextensionplugin.cpp 2021-12-04 16:55:11.000000000 +0000 +++ bluez-qt-5.90.0/src/imports/bluezqtextensionplugin.cpp 2022-01-01 12:10:33.000000000 +0000 @@ -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 -Nru bluez-qt-5.89.0/src/imports/CMakeLists.txt bluez-qt-5.90.0/src/imports/CMakeLists.txt --- bluez-qt-5.89.0/src/imports/CMakeLists.txt 2021-12-04 16:55:11.000000000 +0000 +++ bluez-qt-5.90.0/src/imports/CMakeLists.txt 2022-01-01 12:10:33.000000000 +0000 @@ -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 -Nru bluez-qt-5.89.0/src/imports/declarativeadapter.cpp bluez-qt-5.90.0/src/imports/declarativeadapter.cpp --- bluez-qt-5.89.0/src/imports/declarativeadapter.cpp 2021-12-04 16:55:11.000000000 +0000 +++ bluez-qt-5.90.0/src/imports/declarativeadapter.cpp 2022-01-01 12:10:33.000000000 +0000 @@ -8,8 +8,11 @@ #include "declarativeadapter.h" #include "declarativedevice.h" - +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +static qsizetype devicesCountDeclarativeAdapterFunction(QQmlListProperty *property) +#else static int devicesCountDeclarativeAdapterFunction(QQmlListProperty *property) +#endif { Q_ASSERT(qobject_cast(property->object)); DeclarativeAdapter *adapter = static_cast(property->object); @@ -17,7 +20,11 @@ return adapter->m_devices.count(); } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +static DeclarativeDevice *devicesAtDeclarativeAdapterFunction(QQmlListProperty *property, qsizetype index) +#else static DeclarativeDevice *devicesAtDeclarativeAdapterFunction(QQmlListProperty *property, int index) +#endif { Q_ASSERT(qobject_cast(property->object)); DeclarativeAdapter *adapter = static_cast(property->object); diff -Nru bluez-qt-5.89.0/src/imports/declarativemanager.cpp bluez-qt-5.90.0/src/imports/declarativemanager.cpp --- bluez-qt-5.89.0/src/imports/declarativemanager.cpp 2021-12-04 16:55:11.000000000 +0000 +++ bluez-qt-5.90.0/src/imports/declarativemanager.cpp 2022-01-01 12:10:33.000000000 +0000 @@ -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 *property) +#else static int adaptersCountFunction(QQmlListProperty *property) +#endif { Q_ASSERT(qobject_cast(property->object)); DeclarativeManager *manager = static_cast(property->object); @@ -21,7 +24,11 @@ return manager->m_adapters.count(); } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +static DeclarativeAdapter *adaptersAtFunction(QQmlListProperty *property, qsizetype index) +#else static DeclarativeAdapter *adaptersAtFunction(QQmlListProperty *property, int index) +#endif { Q_ASSERT(qobject_cast(property->object)); DeclarativeManager *manager = static_cast(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 *property) +#else static int devicesCountFunction(QQmlListProperty *property) +#endif { Q_ASSERT(qobject_cast(property->object)); DeclarativeManager *manager = static_cast(property->object); @@ -37,7 +48,11 @@ return manager->m_devices.count(); } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +static DeclarativeDevice *devicesAtFunction(QQmlListProperty *property, qsizetype index) +#else static DeclarativeDevice *devicesAtFunction(QQmlListProperty *property, int index) +#endif { Q_ASSERT(qobject_cast(property->object)); DeclarativeManager *manager = static_cast(property->object); diff -Nru bluez-qt-5.89.0/src/tpendingcall.h bluez-qt-5.90.0/src/tpendingcall.h --- bluez-qt-5.89.0/src/tpendingcall.h 2021-12-04 16:55:11.000000000 +0000 +++ bluez-qt-5.90.0/src/tpendingcall.h 2022-01-01 12:10:33.000000000 +0000 @@ -55,7 +55,11 @@ inline const typename Select::Type valueAt() const { using ResultType = typename Select::Type; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + return qdbus_cast(m_reply.argumentAt(Index)); +#else return qdbus_cast(m_reply.argumentAt(Index), nullptr); +#endif } private: diff -Nru bluez-qt-5.89.0/tests/CMakeLists.txt bluez-qt-5.90.0/tests/CMakeLists.txt --- bluez-qt-5.89.0/tests/CMakeLists.txt 2021-12-04 16:55:11.000000000 +0000 +++ bluez-qt-5.90.0/tests/CMakeLists.txt 2022-01-01 12:10:33.000000000 +0000 @@ -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 -Nru bluez-qt-5.89.0/tools/bluezapi2qt/CMakeLists.txt bluez-qt-5.90.0/tools/bluezapi2qt/CMakeLists.txt --- bluez-qt-5.89.0/tools/bluezapi2qt/CMakeLists.txt 2021-12-04 16:55:11.000000000 +0000 +++ bluez-qt-5.90.0/tools/bluezapi2qt/CMakeLists.txt 2022-01-01 12:10:33.000000000 +0000 @@ -14,5 +14,5 @@ ) target_link_libraries(bluezapi2qt - Qt5::Core + Qt${QT_MAJOR_VERSION}::Core ) diff -Nru bluez-qt-5.89.0/tools/bluezapi2qt/Comment.cpp bluez-qt-5.90.0/tools/bluezapi2qt/Comment.cpp --- bluez-qt-5.89.0/tools/bluezapi2qt/Comment.cpp 2021-12-04 16:55:11.000000000 +0000 +++ bluez-qt-5.90.0/tools/bluezapi2qt/Comment.cpp 2022-01-01 12:10:33.000000000 +0000 @@ -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;