Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kitemmodels for openSUSE:Factory checked in at 2022-01-11 21:16:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kitemmodels (Old) and /work/SRC/openSUSE:Factory/.kitemmodels.new.1892 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kitemmodels" Tue Jan 11 21:16:29 2022 rev:99 rq:945066 version:5.90.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kitemmodels/kitemmodels.changes 2021-12-13 20:44:23.720485071 +0100 +++ /work/SRC/openSUSE:Factory/.kitemmodels.new.1892/kitemmodels.changes 2022-01-11 21:19:10.860955088 +0100 @@ -1,0 +2,14 @@ +Mon Jan 3 12:47:41 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- 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: + * Support numeric sort and filter roles next to role names + * Add TODO for removing invokable removeRows wrappers with Qt 6.4 + * Add missing qt6 porting code + * Compile against qt6 + * Forward removeRow(s) to QML + +------------------------------------------------------------------- Old: ---- kitemmodels-5.89.0.tar.xz kitemmodels-5.89.0.tar.xz.sig New: ---- kitemmodels-5.90.0.tar.xz kitemmodels-5.90.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kitemmodels.spec ++++++ --- /var/tmp/diff_new_pack.wTEo9D/_old 2022-01-11 21:19:11.408955474 +0100 +++ /var/tmp/diff_new_pack.wTEo9D/_new 2022-01-11 21:19:11.412955477 +0100 @@ -17,23 +17,23 @@ %define lname libKF5ItemModels5 -%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}')} %bcond_with python # Only needed for the package signature condition -%bcond_without lang +%bcond_without released Name: kitemmodels -Version: 5.89.0 +Version: 5.90.0 Release: 0 Summary: Set of item models extending the Qt model-view framework 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 ++++++ kitemmodels-5.89.0.tar.xz -> kitemmodels-5.90.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.89.0/CMakeLists.txt new/kitemmodels-5.90.0/CMakeLists.txt --- old/kitemmodels-5.89.0/CMakeLists.txt 2021-12-04 18:01:36.000000000 +0100 +++ new/kitemmodels-5.90.0/CMakeLists.txt 2022-01-01 13:16:35.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(KItemModels 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) @@ -18,11 +18,11 @@ include(ECMQtDeclareLoggingCategory) set(REQUIRED_QT_VERSION 5.15.2) -find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) -find_package(Qt5Qml ${REQUIRED_QT_VERSION} NO_MODULE) +find_package(Qt${QT_MAJOR_VERSION}Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) +find_package(Qt${QT_MAJOR_VERSION}Qml ${REQUIRED_QT_VERSION} NO_MODULE) include(ECMGenerateExportHeader) -set_package_properties(Qt5Qml PROPERTIES +set_package_properties(Qt${QT_MAJOR_VERSION}Qml PROPERTIES TYPE OPTIONAL PURPOSE "Build QML import for KItemModels" ) @@ -80,7 +80,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kitemmodels_version.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF} COMPONENT Devel ) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.89.0/KF5ItemModelsConfig.cmake.in new/kitemmodels-5.90.0/KF5ItemModelsConfig.cmake.in --- old/kitemmodels-5.89.0/KF5ItemModelsConfig.cmake.in 2021-12-04 18:01:36.000000000 +0100 +++ new/kitemmodels-5.90.0/KF5ItemModelsConfig.cmake.in 2022-01-01 13:16:35.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}/KF5ItemModelsTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.89.0/autotests/CMakeLists.txt new/kitemmodels-5.90.0/autotests/CMakeLists.txt --- old/kitemmodels-5.89.0/autotests/CMakeLists.txt 2021-12-04 18:01:36.000000000 +0100 +++ new/kitemmodels-5.90.0/autotests/CMakeLists.txt 2022-01-01 13:16:35.000000000 +0100 @@ -8,7 +8,7 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII) remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY) -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test Widgets) +find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test Widgets) add_subdirectory(proxymodeltestsuite) add_subdirectory(bihash) @@ -38,19 +38,19 @@ krearrangecolumnsproxymodeltest.cpp knumbermodeltest.cpp kcolumnheadersmodeltest.cpp - LINK_LIBRARIES KF5::ItemModels Qt5::Test Qt5::Widgets proxymodeltestsuite + LINK_LIBRARIES KF5::ItemModels Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Widgets proxymodeltestsuite ) -if (${Qt5Qml_FOUND}) +if (TARGET Qt${QT_MAJOR_VERSION}::Qml) ecm_add_tests( ${kconcatenaterows_qml_SRC} ksortfilterproxymodel_qml.cpp - LINK_LIBRARIES KF5::ItemModels Qt5::Test Qt5::Qml Qt5::Gui + LINK_LIBRARIES KF5::ItemModels Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Qml Qt${QT_MAJOR_VERSION}::Gui ) endif() #we need additional sources for this test, can't use it in ecm_add_tests ecm_add_test(kselectionproxymodel_smoketest.cpp ${proxyModelSmokeTestSources} TEST_NAME "kselectionproxymodel_smoketest" - LINK_LIBRARIES KF5::ItemModels Qt5::Test Qt5::Widgets proxymodeltestsuite + LINK_LIBRARIES KF5::ItemModels Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Widgets proxymodeltestsuite ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.89.0/autotests/bihash/CMakeLists.txt new/kitemmodels-5.90.0/autotests/bihash/CMakeLists.txt --- old/kitemmodels-5.89.0/autotests/bihash/CMakeLists.txt 2021-12-04 18:01:36.000000000 +0100 +++ new/kitemmodels-5.90.0/autotests/bihash/CMakeLists.txt 2022-01-01 13:16:35.000000000 +0100 @@ -5,12 +5,12 @@ add_executable(bihash_functionalitytest functionalitytest.cpp) target_link_libraries(bihash_functionalitytest - Qt5::Core + Qt${QT_MAJOR_VERSION}::Core ) add_executable(bihash_benchmarks_exec benchmarks.cpp) target_link_libraries(bihash_benchmarks_exec - Qt5::Widgets - Qt5::Test + Qt${QT_MAJOR_VERSION}::Widgets + Qt${QT_MAJOR_VERSION}::Test ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.89.0/autotests/proxymodeltestsuite/CMakeLists.txt new/kitemmodels-5.90.0/autotests/proxymodeltestsuite/CMakeLists.txt --- old/kitemmodels-5.89.0/autotests/proxymodeltestsuite/CMakeLists.txt 2021-12-04 18:01:36.000000000 +0100 +++ new/kitemmodels-5.90.0/autotests/proxymodeltestsuite/CMakeLists.txt 2022-01-01 13:16:35.000000000 +0100 @@ -45,8 +45,8 @@ generate_export_header(proxymodeltestsuite) target_link_libraries(proxymodeltestsuite - Qt5::Widgets - Qt5::Test + Qt${QT_MAJOR_VERSION}::Widgets + Qt${QT_MAJOR_VERSION}::Test ${Grantlee_CORE_LIBRARIES} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.89.0/autotests/proxymodeltestsuite/proxymodeltest.cpp new/kitemmodels-5.90.0/autotests/proxymodeltestsuite/proxymodeltest.cpp --- old/kitemmodels-5.89.0/autotests/proxymodeltestsuite/proxymodeltest.cpp 2021-12-04 18:01:36.000000000 +0100 +++ new/kitemmodels-5.90.0/autotests/proxymodeltestsuite/proxymodeltest.cpp 2022-01-01 13:16:35.000000000 +0100 @@ -656,7 +656,9 @@ case QVariant::DateTime: case QVariant::Url: case QVariant::Locale: +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) case QVariant::RegExp: +#endif return qHash(var.toString()); case QVariant::Map: case QVariant::List: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.89.0/src/CMakeLists.txt new/kitemmodels-5.90.0/src/CMakeLists.txt --- old/kitemmodels-5.89.0/src/CMakeLists.txt 2021-12-04 18:01:36.000000000 +0100 +++ new/kitemmodels-5.90.0/src/CMakeLists.txt 2022-01-01 13:16:35.000000000 +0100 @@ -1,5 +1,5 @@ add_subdirectory(core) -if (${Qt5Qml_FOUND}) +if (TARGET Qt${QT_MAJOR_VERSION}::Qml) add_subdirectory(qml) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.89.0/src/core/CMakeLists.txt new/kitemmodels-5.90.0/src/core/CMakeLists.txt --- old/kitemmodels-5.89.0/src/core/CMakeLists.txt 2021-12-04 18:01:36.000000000 +0100 +++ new/kitemmodels-5.90.0/src/core/CMakeLists.txt 2022-01-01 13:16:35.000000000 +0100 @@ -54,9 +54,9 @@ EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) -target_include_directories(KF5ItemModels INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KItemModels>") +target_include_directories(KF5ItemModels INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KItemModels>") -target_link_libraries(KF5ItemModels PUBLIC Qt5::Core) +target_link_libraries(KF5ItemModels PUBLIC Qt${QT_MAJOR_VERSION}::Core) ecm_generate_headers(KItemModels_HEADERS HEADER_NAMES @@ -104,7 +104,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kitemmodels_export.h ${KItemModels_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KItemModels COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KItemModels COMPONENT Devel ) if(BUILD_QCH) @@ -132,5 +132,5 @@ endif() include(ECMGeneratePriFile) -ecm_generate_pri_file(BASE_NAME KItemModels LIB_NAME KF5ItemModels DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KItemModels) +ecm_generate_pri_file(BASE_NAME KItemModels LIB_NAME KF5ItemModels DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/KItemModels) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.89.0/src/qml/CMakeLists.txt new/kitemmodels-5.90.0/src/qml/CMakeLists.txt --- old/kitemmodels-5.89.0/src/qml/CMakeLists.txt 2021-12-04 18:01:36.000000000 +0100 +++ new/kitemmodels-5.90.0/src/qml/CMakeLists.txt 2022-01-01 13:16:35.000000000 +0100 @@ -36,7 +36,7 @@ ) target_link_libraries(itemmodelsplugin - Qt5::Qml + Qt${QT_MAJOR_VERSION}::Qml KF5::ItemModels ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.89.0/src/qml/ksortfilterproxymodel.cpp new/kitemmodels-5.90.0/src/qml/ksortfilterproxymodel.cpp --- old/kitemmodels-5.89.0/src/qml/ksortfilterproxymodel.cpp 2021-12-04 18:01:36.000000000 +0100 +++ new/kitemmodels-5.90.0/src/qml/ksortfilterproxymodel.cpp 2022-01-01 13:16:35.000000000 +0100 @@ -166,31 +166,51 @@ return m_filterColumnCallback; } -void KSortFilterProxyModel::setFilterRole(const QString &role) +void KSortFilterProxyModel::setFilterRole(const QVariant &role) { - QSortFilterProxyModel::setFilterRole(roleNameToId(role)); - m_filterRole = role; - Q_EMIT filterRoleChanged(); + if (role.type() == QVariant::String) { + QSortFilterProxyModel::setFilterRole(roleNameToId(role.toString())); + m_filterRole = role; + Q_EMIT filterRoleChanged(); + } else if (role.canConvert<int>()) { + QSortFilterProxyModel::setFilterRole(role.toInt()); + m_filterRole = role; + Q_EMIT filterRoleChanged(); + } else if (!role.isNull()) { + qCWarning(KITEMMODELS_LOG) << "invalid filter role:" << role; + } } -QString KSortFilterProxyModel::filterRole() const +QVariant KSortFilterProxyModel::filterRole() const { return m_filterRole; } -void KSortFilterProxyModel::setSortRole(const QString &role) +void KSortFilterProxyModel::setSortRole(const QVariant &role) { - m_sortRole = role; - if (role.isEmpty()) { - sort(-1, Qt::AscendingOrder); - } else if (sourceModel()) { - QSortFilterProxyModel::setSortRole(roleNameToId(role)); - sort(std::max(sortColumn(), 0), sortOrder()); + if (role.type() == QVariant::String) { + m_sortRole = role; + const auto roleName = role.toString(); + if (roleName.isEmpty()) { + sort(-1, Qt::AscendingOrder); + } else if (sourceModel()) { + QSortFilterProxyModel::setSortRole(roleNameToId(roleName)); + sort(std::max(sortColumn(), 0), sortOrder()); + } + Q_EMIT sortRoleChanged(); + } else if (role.canConvert<int>()) { + const auto roleId = role.toInt(); + if (sourceModel()) { + QSortFilterProxyModel::setSortRole(roleId); + sort(std::max(sortColumn(), 0), sortOrder()); + } + Q_EMIT sortRoleChanged(); + } else if (!role.isNull()) { + qCWarning(KITEMMODELS_LOG) << "invalid sort role:" << role; } - Q_EMIT sortRoleChanged(); } -QString KSortFilterProxyModel::sortRole() const +QVariant KSortFilterProxyModel::sortRole() const { return m_sortRole; } @@ -228,3 +248,13 @@ { QSortFilterProxyModel::invalidateFilter(); } + +bool KSortFilterProxyModel::removeRow(int row, const QModelIndex &parent) +{ + return QSortFilterProxyModel::removeRow(row, parent); +} + +bool KSortFilterProxyModel::removeRows(int row, int count, const QModelIndex &parent) +{ + return QSortFilterProxyModel::removeRows(row, count, parent); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.89.0/src/qml/ksortfilterproxymodel.h new/kitemmodels-5.90.0/src/qml/ksortfilterproxymodel.h --- old/kitemmodels-5.89.0/src/qml/ksortfilterproxymodel.h 2021-12-04 18:01:36.000000000 +0100 +++ new/kitemmodels-5.90.0/src/qml/ksortfilterproxymodel.h 2022-01-01 13:16:35.000000000 +0100 @@ -74,13 +74,15 @@ /** * The role of the sourceModel on which the filter will be applied. + * This can either be the numerical role value or the role name as a string. */ - Q_PROPERTY(QString filterRole READ filterRole WRITE setFilterRole NOTIFY filterRoleChanged) + Q_PROPERTY(QVariant filterRole READ filterRole WRITE setFilterRole NOTIFY filterRoleChanged) /** * The role of the sourceModel that will be used for sorting. if empty the order will be left unaltered + * This can either be the numerical role value or the role name as a string. */ - Q_PROPERTY(QString sortRole READ sortRole WRITE setSortRole NOTIFY sortRoleChanged) + Q_PROPERTY(QVariant sortRole READ sortRole WRITE setSortRole NOTIFY sortRoleChanged) /** * One of Qt.AscendingOrder or Qt.DescendingOrder @@ -114,11 +116,11 @@ void setFilterColumnCallback(const QJSValue &callback); QJSValue filterColumnCallback() const; - void setFilterRole(const QString &role); - QString filterRole() const; + void setFilterRole(const QVariant &role); + QVariant filterRole() const; - void setSortRole(const QString &role); - QString sortRole() const; + void setSortRole(const QVariant &role); + QVariant sortRole() const; void setSortOrder(const Qt::SortOrder order); void setSortColumn(int column); @@ -126,6 +128,10 @@ void classBegin() override; void componentComplete() override; + // TODO KF6: those two can be dropped once we depend on Qt 6.4 + Q_INVOKABLE bool removeRow(int row, const QModelIndex &parent = QModelIndex()); + Q_INVOKABLE bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override; + public Q_SLOTS: /** * Invalidates the current filtering. @@ -158,9 +164,9 @@ private: bool m_componentCompleted = false; - QString m_filterRole; + QVariant m_filterRole; QString m_filterString; - QString m_sortRole; + QVariant m_sortRole; QJSValue m_filterRowCallback; QJSValue m_filterColumnCallback; QHash<QString, int> m_roleIds; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.89.0/tests/CMakeLists.txt new/kitemmodels-5.90.0/tests/CMakeLists.txt --- old/kitemmodels-5.89.0/tests/CMakeLists.txt 2021-12-04 18:01:36.000000000 +0100 +++ new/kitemmodels-5.90.0/tests/CMakeLists.txt 2022-01-01 13:16:35.000000000 +0100 @@ -1,16 +1,17 @@ remove_definitions(-DQT_NO_CAST_TO_ASCII) remove_definitions(-DQT_NO_CAST_FROM_ASCII) -add_subdirectory(proxymodeltestapp) - -find_package(Qt5Widgets ${REQUIRED_QT_VERSION} CONFIG) -if (Qt5Widgets_FOUND) +if (TARGET Qt${QT_MAJOR_VERSION}::QuickWidgets) + add_subdirectory(proxymodeltestapp) +endif() +find_package(Qt${QT_MAJOR_VERSION}Widgets ${REQUIRED_QT_VERSION} CONFIG) +if (TARGET Qt${QT_MAJOR_VERSION}::Widgets) macro(KITEMMODELS_WIDGETS_TESTS) foreach(_testname ${ARGN}) add_executable(${_testname} ${_testname}.cpp) target_link_libraries(${_testname} KF5::ItemModels - Qt5::Widgets) + Qt${QT_MAJOR_VERSION}::Widgets) ecm_mark_as_test(${_testname}) endforeach() endmacro(KITEMMODELS_WIDGETS_TESTS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.89.0/tests/proxymodeltestapp/CMakeLists.txt new/kitemmodels-5.90.0/tests/proxymodeltestapp/CMakeLists.txt --- old/kitemmodels-5.89.0/tests/proxymodeltestapp/CMakeLists.txt 2021-12-04 18:01:36.000000000 +0100 +++ new/kitemmodels-5.90.0/tests/proxymodeltestapp/CMakeLists.txt 2022-01-01 13:16:35.000000000 +0100 @@ -19,17 +19,17 @@ descendantqmltree.cpp ) -find_package(Qt5Widgets ${REQUIRED_QT_VERSION} QUIET CONFIG) -find_package(Qt5Script ${REQUIRED_QT_VERSION} QUIET CONFIG) -if (Qt5Script_FOUND) +find_package(Qt${QT_MAJOR_VERSION}Widgets ${REQUIRED_QT_VERSION} QUIET CONFIG) +find_package(Qt${QT_MAJOR_VERSION}Script ${REQUIRED_QT_VERSION} QUIET CONFIG) +if (TARGET Qt5::Script) list(APPEND proxymodeltestapp_SRCS reparentingpmwidget.cpp scriptablereparentingwidget.cpp ) endif() -find_package(Qt5QuickWidgets ${REQUIRED_QT_VERSION} CONFIG) -if (Qt5QuickWidgets_FOUND AND NOT Qt5QuickWidgets_VERSION VERSION_LESS 5.5) +find_package(Qt${QT_MAJOR_VERSION}QuickWidgets ${REQUIRED_QT_VERSION} CONFIG) +if (Qt${QT_MAJOR_VERSION}QuickWidgets_FOUND AND NOT Qt${QT_MAJOR_VERSION}QuickWidgets_VERSION VERSION_LESS 5.5) list(APPEND proxymodeltestapp_SRCS selectioninqmlwidget.cpp ) @@ -41,16 +41,16 @@ target_link_libraries(proxymodeltestapp KF5::ItemModels proxymodeltestsuite - Qt5::Widgets + Qt${QT_MAJOR_VERSION}::Widgets ) -if (Qt5Script_FOUND) +if (TARGET Qt5::Script) target_link_libraries(proxymodeltestapp - Qt5::Script + Qt${QT_MAJOR_VERSION}::Script ) endif() -if (Qt5QuickWidgets_FOUND AND NOT Qt5QuickWidgets_VERSION VERSION_LESS 5.5) +if (TARGET Qt${QT_MAJOR_VERSION}::QuickWidgets AND NOT Qt${QT_MAJOR_VERSION}QuickWidgets_VERSION VERSION_LESS 5.5) target_link_libraries(proxymodeltestapp - Qt5::QuickWidgets + Qt${QT_MAJOR_VERSION}::QuickWidgets ) endif()
