Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kcontacts for openSUSE:Factory checked in at 2022-01-11 21:16:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcontacts (Old) and /work/SRC/openSUSE:Factory/.kcontacts.new.1892 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcontacts" Tue Jan 11 21:16:06 2022 rev:76 rq:945041 version:5.90.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kcontacts/kcontacts.changes 2021-12-13 20:43:50.680481024 +0100 +++ /work/SRC/openSUSE:Factory/.kcontacts.new.1892/kcontacts.changes 2022-01-11 21:18:29.000925645 +0100 @@ -1,0 +2,10 @@ +Mon Jan 3 12:47:21 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: + * Make it compile against qt6 + +------------------------------------------------------------------- Old: ---- kcontacts-5.89.0.tar.xz kcontacts-5.89.0.tar.xz.sig New: ---- kcontacts-5.90.0.tar.xz kcontacts-5.90.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcontacts.spec ++++++ --- /var/tmp/diff_new_pack.DyL68X/_old 2022-01-11 21:18:31.044927083 +0100 +++ /var/tmp/diff_new_pack.DyL68X/_new 2022-01-11 21:18:31.048927086 +0100 @@ -16,21 +16,21 @@ # -%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_without lang +%bcond_without released Name: kcontacts -Version: 5.89.0 +Version: 5.90.0 Release: 0 Summary: KDE Frameworks based address book API 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 @@ -86,7 +86,7 @@ %install %kf5_makeinstall -C build - %if %{with lang} + %if %{with released} %find_lang %{name} --with-man --all-name %endif @@ -106,7 +106,7 @@ %{_kf5_libdir}/libKF5Contacts.so %{_kf5_mkspecsdir}/qt_KContacts.pri -%if %{with lang} +%if %{with released} %files lang -f %{name}.lang %endif ++++++ kcontacts-5.89.0.tar.xz -> kcontacts-5.90.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.89.0/CMakeLists.txt new/kcontacts-5.90.0/CMakeLists.txt --- old/kcontacts-5.89.0/CMakeLists.txt 2021-12-04 19:33:12.000000000 +0100 +++ new/kcontacts-5.90.0/CMakeLists.txt 2022-01-01 13:27:23.000000000 +0100 @@ -1,13 +1,13 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.89.0") # handled by release scripts -set(KF_DEP_VERSION "5.89.0") # handled by release scripts +set(KF_VERSION "5.90.0") # handled by release scripts +set(KF_DEP_VERSION "5.90.0") # handled by release scripts project(KContacts VERSION ${KF_VERSION}) # ECM setup 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) @@ -44,8 +44,11 @@ ) ########### Find packages ########### -find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Gui) +find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Gui) find_package(KF5 ${KF_DEP_VERSION} REQUIRED COMPONENTS CoreAddons I18n Config Codecs) +if (QT_MAJOR_VERSION STREQUAL "6") + find_package(Qt6Core5Compat) +endif() ########### Targets ########### @@ -53,7 +56,7 @@ ki18n_install(po) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055100) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055900) add_subdirectory(src) @@ -92,7 +95,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kcontacts_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/kcontacts-5.89.0/autotests/CMakeLists.txt new/kcontacts-5.90.0/autotests/CMakeLists.txt --- old/kcontacts-5.89.0/autotests/CMakeLists.txt 2021-12-04 19:33:12.000000000 +0100 +++ new/kcontacts-5.90.0/autotests/CMakeLists.txt 2022-01-01 13:27:23.000000000 +0100 @@ -1,13 +1,13 @@ include(ECMAddTests) -find_package(Qt5Test ${REQUIRED_QT_VERSION} CONFIG REQUIRED) +find_package(Qt${QT_MAJOR_VERSION}Test ${REQUIRED_QT_VERSION} CONFIG REQUIRED) ########### next target ############### add_executable(testroundtrip) target_sources(testroundtrip PRIVATE testroundtrip.cpp testroundtrip.qrc) add_test(NAME kcontacts-testroundtrip COMMAND testroundtrip) -target_link_libraries(testroundtrip KF5Contacts Qt5::Test) +target_link_libraries(testroundtrip KF5Contacts Qt${QT_MAJOR_VERSION}::Test) ecm_add_tests(birthdaytest.cpp addresseetest.cpp @@ -37,11 +37,11 @@ orgtest.cpp datetimetest.cpp clientpidmaptest.cpp - NAME_PREFIX "kcontacts-" LINK_LIBRARIES KF5Contacts Qt5::Test KF5::ConfigCore) + NAME_PREFIX "kcontacts-" LINK_LIBRARIES KF5Contacts Qt${QT_MAJOR_VERSION}::Test KF5::ConfigCore) ecm_add_tests(picturetest.cpp - NAME_PREFIX "kcontacts-" LINK_LIBRARIES KF5Contacts Qt5::Test KF5::ConfigCore Qt5::Gui) + NAME_PREFIX "kcontacts-" LINK_LIBRARIES KF5Contacts Qt${QT_MAJOR_VERSION}::Test KF5::ConfigCore Qt${QT_MAJOR_VERSION}::Gui) # Benchmark, compiled, but not run automatically with ctest add_executable(vcardtool_benchmark vcardtool_benchmark.cpp) -target_link_libraries(vcardtool_benchmark KF5Contacts Qt5::Test KF5::ConfigCore) +target_link_libraries(vcardtool_benchmark KF5Contacts Qt${QT_MAJOR_VERSION}::Test KF5::ConfigCore) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.89.0/po/ar/kcontacts5.po new/kcontacts-5.90.0/po/ar/kcontacts5.po --- old/kcontacts-5.89.0/po/ar/kcontacts5.po 2021-12-04 19:33:12.000000000 +0100 +++ new/kcontacts-5.90.0/po/ar/kcontacts5.po 2022-01-01 13:27:23.000000000 +0100 @@ -3,23 +3,23 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # Youssef Chahibi <[email protected]>, 2007. -# zayed <[email protected]>, 2009. +# zayed <[email protected]>, 2009, 2021. # Safa Alfulaij <[email protected]>, 2018. msgid "" msgstr "" "Project-Id-Version: kabc\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-10-24 00:14+0000\n" -"PO-Revision-Date: 2018-01-31 19:03+0300\n" -"Last-Translator: Safa Alfulaij <[email protected]>\n" -"Language-Team: Arabic <[email protected]>\n" +"PO-Revision-Date: 2021-12-22 18:17+0400\n" +"Last-Translator: Zayed Al-Saidi <[email protected]>\n" +"Language-Team: ar\n" "Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 21.07.70\n" #: address.cpp:377 #, kde-format @@ -57,9 +57,9 @@ msgstr "??????????????" #: address.cpp:489 -#, fuzzy, kde-format +#, kde-format msgid "Delivery Label" -msgstr "?????????? ????????????????" +msgstr "???????? ????????????????" #: address.cpp:507 #, kde-format @@ -174,7 +174,7 @@ msgstr "?????????? ?????????????? ??????????????" #: addressee.cpp:883 -#, fuzzy, kde-format +#, kde-format msgid "Home Address State" msgstr "?????????? ?????????????? ????????????????" @@ -191,7 +191,7 @@ #: addressee.cpp:898 #, kde-format msgid "Home Address Label" -msgstr "" +msgstr "???????? ?????????? ????????????" #: addressee.cpp:903 #, kde-format @@ -209,7 +209,7 @@ msgstr "?????????? ???????????? ??????????????" #: addressee.cpp:918 -#, fuzzy, kde-format +#, kde-format msgid "Business Address State" msgstr "?????????? ???????????? ????????????????" @@ -226,7 +226,7 @@ #: addressee.cpp:933 #, kde-format msgid "Business Address Label" -msgstr "" +msgstr "???????? ?????????? ??????????" #: addressee.cpp:938 #, kde-format @@ -266,7 +266,7 @@ #: addressee.cpp:973 phonenumber.cpp:198 #, kde-format msgid "Pager" -msgstr "" +msgstr "??????????????" #: addressee.cpp:978 #, kde-format @@ -313,12 +313,12 @@ #: addressee.cpp:1231 #, kde-format msgid "Note" -msgstr "" +msgstr "????????????????" #: addressee.cpp:1251 #, kde-format msgid "Product Identifier" -msgstr "" +msgstr "???????? ????????????" #: addressee.cpp:1271 #, kde-format @@ -328,7 +328,7 @@ #: addressee.cpp:1291 #, kde-format msgid "Sort String" -msgstr "" +msgstr "?????????? ??????????" #: addressee.cpp:1317 #, kde-format @@ -338,7 +338,7 @@ #: addressee.cpp:1337 #, kde-format msgid "Security Class" -msgstr "" +msgstr "?????????????? ????????????" #: addressee.cpp:1357 #, kde-format @@ -346,12 +346,12 @@ msgstr "??????????????" #: addressee.cpp:1377 -#, fuzzy, kde-format +#, kde-format msgid "Photo" msgstr "??????????????" #: addressee.cpp:1397 -#, fuzzy, kde-format +#, kde-format msgid "Sound" msgstr "????????????" @@ -505,7 +505,7 @@ msgstr "??????????????" #: phonenumber.cpp:180 -#, fuzzy, kde-format +#, kde-format msgid "Voice" msgstr "????????????" @@ -527,7 +527,7 @@ msgstr "????????????" #: phonenumber.cpp:188 -#, fuzzy, kde-format +#, kde-format msgid "Mailbox" msgstr "?????????? ????????????" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.89.0/po/ca@valencia/kcontacts5.po new/kcontacts-5.90.0/po/ca@valencia/kcontacts5.po --- old/kcontacts-5.89.0/po/ca@valencia/kcontacts5.po 2021-12-04 19:33:12.000000000 +0100 +++ new/kcontacts-5.90.0/po/ca@valencia/kcontacts5.po 2022-01-01 13:27:23.000000000 +0100 @@ -3,7 +3,7 @@ # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # -# Josep Ma. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2015, 2017. +# Josep M. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2015, 2017. # Albert Astals Cid <[email protected]>, 2009. # Manuel Tortosa Moreno <[email protected]>, 2009. # Antoni Bella P??rez <[email protected]>, 2014, 2015. @@ -13,7 +13,7 @@ "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-10-24 00:14+0000\n" "PO-Revision-Date: 2017-12-29 18:45+0100\n" -"Last-Translator: Josep Ma. Ferrer <[email protected]>\n" +"Last-Translator: Josep M. Ferrer <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca@valencia\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.89.0/po/zh_CN/kcontacts5.po new/kcontacts-5.90.0/po/zh_CN/kcontacts5.po --- old/kcontacts-5.89.0/po/zh_CN/kcontacts5.po 2021-12-04 19:33:12.000000000 +0100 +++ new/kcontacts-5.90.0/po/zh_CN/kcontacts5.po 2022-01-01 13:27:23.000000000 +0100 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-10-24 00:14+0000\n" -"PO-Revision-Date: 2021-11-30 15:20\n" +"PO-Revision-Date: 2021-12-22 14:05\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.89.0/src/CMakeLists.txt new/kcontacts-5.90.0/src/CMakeLists.txt --- old/kcontacts-5.89.0/src/CMakeLists.txt 2021-12-04 19:33:12.000000000 +0100 +++ new/kcontacts-5.90.0/src/CMakeLists.txt 2022-01-01 13:27:23.000000000 +0100 @@ -99,7 +99,7 @@ EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) -target_include_directories(KF5Contacts INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KContacts>") +target_include_directories(KF5Contacts INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KContacts>") set(KContacts_BUILD_INCLUDE_DIRS ${KContacts_SOURCE_DIR}/src ${KContacts_BINARY_DIR}/src @@ -109,8 +109,8 @@ target_link_libraries(KF5Contacts PUBLIC - Qt5::Core - Qt5::Gui + Qt${QT_MAJOR_VERSION}::Core + Qt${QT_MAJOR_VERSION}::Gui PRIVATE KF5::CoreAddons KF5::ConfigCore @@ -119,6 +119,10 @@ KF5::Codecs # for the vcard parser ) +if (TARGET Qt6::Core5Compat) + target_link_libraries(KF5Contacts PRIVATE Qt6::Core5Compat) # QTextCodec +endif() + set_target_properties(KF5Contacts PROPERTIES VERSION ${KContacts_VERSION} SOVERSION ${KContacts_SOVERSION} @@ -166,13 +170,13 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kcontacts_export.h ${KContacts_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KContacts/kcontacts + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KContacts/kcontacts COMPONENT Devel ) install(FILES ${KContacts_CamelCase_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KContacts/KContacts + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KContacts/KContacts COMPONENT Devel ) @@ -182,7 +186,7 @@ DESTINATION "${KDE_INSTALL_LOGGINGCATEGORIESDIR}" ) -ecm_generate_pri_file(BASE_NAME KContacts LIB_NAME KF5Contacts DEPS "KCoreAddons" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KContacts) +ecm_generate_pri_file(BASE_NAME KContacts LIB_NAME KF5Contacts DEPS "KCoreAddons" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/KContacts) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) if(BUILD_QCH) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.89.0/src/converter/CMakeLists.txt new/kcontacts-5.90.0/src/converter/CMakeLists.txt --- old/kcontacts-5.89.0/src/converter/CMakeLists.txt 2021-12-04 19:33:12.000000000 +0100 +++ new/kcontacts-5.90.0/src/converter/CMakeLists.txt 2022-01-01 13:27:23.000000000 +0100 @@ -8,14 +8,14 @@ install(FILES ${KContacts_CamelCase_Converter_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KContacts/KContacts + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KContacts/KContacts COMPONENT Devel ) install(FILES ${KContacts_Converter_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KContacts/kcontacts + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KContacts/kcontacts COMPONENT Devel ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.89.0/src/converter/ldifconverter.cpp new/kcontacts-5.90.0/src/converter/ldifconverter.cpp --- old/kcontacts-5.89.0/src/converter/ldifconverter.cpp 2021-12-04 19:33:12.000000000 +0100 +++ new/kcontacts-5.90.0/src/converter/ldifconverter.cpp 2022-01-01 13:27:23.000000000 +0100 @@ -29,8 +29,11 @@ #include <KCountry> #include <KLocalizedString> +#include <QIODevice> #include <QStringList> +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #include <QTextCodec> +#endif #include <QTextStream> using namespace KContacts; @@ -91,7 +94,10 @@ return false; } QTextStream t(&str, QIODevice::WriteOnly | QIODevice::Append); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) t.setCodec(QTextCodec::codecForName("UTF-8")); +#endif + t << "objectclass: top\n"; t << "objectclass: groupOfNames\n"; @@ -144,7 +150,9 @@ } QTextStream t(&str, QIODevice::WriteOnly | QIODevice::Append); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) t.setCodec(QTextCodec::codecForName("UTF-8")); +#endif const Address homeAddr = addr.address(Address::Home); const Address workAddr = addr.address(Address::Work); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.89.0/src/picture.cpp new/kcontacts-5.90.0/src/picture.cpp --- old/kcontacts-5.89.0/src/picture.cpp 2021-12-04 19:33:12.000000000 +0100 +++ new/kcontacts-5.90.0/src/picture.cpp 2022-01-01 13:27:23.000000000 +0100 @@ -23,11 +23,11 @@ PicturePrivate(const PicturePrivate &other) : QSharedData(other) + , mUrl(other.mUrl) + , mType(other.mType) + , mData(other.mData) + , mIntern(other.mIntern) { - mUrl = other.mUrl; - mType = other.mType; - mData = other.mData; - mIntern = other.mIntern; } QString mUrl; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.89.0/src/vcardparser/vcard.cpp new/kcontacts-5.90.0/src/vcardparser/vcard.cpp --- old/kcontacts-5.89.0/src/vcardparser/vcard.cpp 2021-12-04 19:33:12.000000000 +0100 +++ new/kcontacts-5.90.0/src/vcardparser/vcard.cpp 2022-01-01 13:27:23.000000000 +0100 @@ -14,8 +14,8 @@ } VCard::VCard(const VCard &vcard) + : mLineMap(vcard.mLineMap) { - mLineMap = vcard.mLineMap; } VCard::~VCard() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.89.0/src/vcardparser/vcardline.cpp new/kcontacts-5.90.0/src/vcardparser/vcardline.cpp --- old/kcontacts-5.89.0/src/vcardparser/vcardline.cpp 2021-12-04 19:33:12.000000000 +0100 +++ new/kcontacts-5.90.0/src/vcardparser/vcardline.cpp 2022-01-01 13:27:23.000000000 +0100 @@ -16,22 +16,22 @@ } VCardLine::VCardLine(const QString &identifier) + : VCardLine(identifier, {}) { - mIdentifier = identifier; } VCardLine::VCardLine(const QString &identifier, const QVariant &value) + : mIdentifier(identifier) + , mValue(value) { - mIdentifier = identifier; - mValue = value; } VCardLine::VCardLine(const VCardLine &line) + : mParamMap(line.mParamMap) + , mIdentifier(line.mIdentifier) + , mGroup(line.mGroup) + , mValue(line.mValue) { - mParamMap = line.mParamMap; - mValue = line.mValue; - mIdentifier = line.mIdentifier; - mGroup = line.mGroup; } VCardLine::~VCardLine() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.89.0/tests/CMakeLists.txt new/kcontacts-5.90.0/tests/CMakeLists.txt --- old/kcontacts-5.89.0/tests/CMakeLists.txt 2021-12-04 19:33:12.000000000 +0100 +++ new/kcontacts-5.90.0/tests/CMakeLists.txt 2022-01-01 13:27:23.000000000 +0100 @@ -5,15 +5,15 @@ # FIXME: Build fails add_executable(testread testread.cpp) -target_link_libraries(testread KF5Contacts KF5::I18n Qt5::Gui) +target_link_libraries(testread KF5Contacts KF5::I18n Qt${QT_MAJOR_VERSION}::Gui) ########### next target ############### # FIXME: Build fails add_executable(testwrite testwrite.cpp) -target_link_libraries(testwrite KF5Contacts Qt5::Gui KF5::I18n) +target_link_libraries(testwrite KF5Contacts Qt${QT_MAJOR_VERSION}::Gui KF5::I18n) ########### next target ############### add_executable(testread2 testread2.cpp testutils.cpp) -target_link_libraries(testread2 KF5Contacts Qt5::Gui) +target_link_libraries(testread2 KF5Contacts Qt${QT_MAJOR_VERSION}::Gui)
