Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package grantleetheme for openSUSE:Factory checked in at 2023-08-31 13:42:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grantleetheme (Old) and /work/SRC/openSUSE:Factory/.grantleetheme.new.1766 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grantleetheme" Thu Aug 31 13:42:55 2023 rev:90 rq:1105629 version:23.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/grantleetheme/grantleetheme.changes 2023-07-07 15:46:32.931920199 +0200 +++ /work/SRC/openSUSE:Factory/.grantleetheme.new.1766/grantleetheme.changes 2023-08-31 13:43:57.616453786 +0200 @@ -1,0 +2,31 @@ +Sun Aug 20 13:59:01 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.08.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/23.08.0/ +- No code change since 23.07.90 + +------------------------------------------------------------------- +Mon Aug 14 08:02:18 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.07.90 + * New feature release +- No code change since 23.07.80 + +------------------------------------------------------------------- +Tue Aug 1 10:13:23 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.07.80 + * New feature release +- Changes since 23.04.3: + * Remove CI 6 job. We will use kf6 branch for kf6 works + * not export symbol of private methods + * Fix show text in qt6 + * Add QCh support + * Remove unused variable + * Remove unused alias now + * Remove compat support as all was ported + * Use correct INSTALL_TARGETS_DEFAULT_ARGS + +------------------------------------------------------------------- Old: ---- grantleetheme-23.04.3.tar.xz grantleetheme-23.04.3.tar.xz.sig New: ---- grantleetheme-23.08.0.tar.xz grantleetheme-23.08.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grantleetheme.spec ++++++ --- /var/tmp/diff_new_pack.mvbwLG/_old 2023-08-31 13:43:58.756494534 +0200 +++ /var/tmp/diff_new_pack.mvbwLG/_new 2023-08-31 13:43:58.760494676 +0200 @@ -18,7 +18,7 @@ %bcond_without released Name: grantleetheme -Version: 23.04.3 +Version: 23.08.0 Release: 0 Summary: Grantlee theme support License: GPL-2.0-only @@ -98,7 +98,6 @@ %files devel %dir %{_includedir}/KPim5 %{_includedir}/KPim5/GrantleeTheme/ -%{_kf5_cmakedir}/KF5GrantleeTheme/ %{_kf5_cmakedir}/KPim5GrantleeTheme/ %{_kf5_libdir}/libKPim5GrantleeTheme.so %{_kf5_mkspecsdir}/qt_GrantleeTheme.pri ++++++ grantleetheme-23.04.3.tar.xz -> grantleetheme-23.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-23.04.3/.gitignore new/grantleetheme-23.08.0/.gitignore --- old/grantleetheme-23.04.3/.gitignore 2023-07-04 07:14:48.000000000 +0200 +++ new/grantleetheme-23.08.0/.gitignore 2023-08-12 08:00:17.000000000 +0200 @@ -26,3 +26,4 @@ .idea /cmake-build* .cache +Testing/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-23.04.3/.gitlab-ci.yml new/grantleetheme-23.08.0/.gitlab-ci.yml --- old/grantleetheme-23.04.3/.gitlab-ci.yml 2023-07-04 07:14:48.000000000 +0200 +++ new/grantleetheme-23.08.0/.gitlab-ci.yml 2023-08-12 08:00:17.000000000 +0200 @@ -3,8 +3,5 @@ include: - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows-qt6.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-23.04.3/.kde-ci.yml new/grantleetheme-23.08.0/.kde-ci.yml --- old/grantleetheme-23.04.3/.kde-ci.yml 2023-07-04 07:14:48.000000000 +0200 +++ new/grantleetheme-23.08.0/.kde-ci.yml 2023-08-12 08:00:17.000000000 +0200 @@ -10,16 +10,3 @@ 'frameworks/kiconthemes': '@latest' 'frameworks/knewstuff': '@latest' 'frameworks/kxmlgui': '@latest' - -- 'on': ['Linux/Qt6', 'FreeBSD/Qt6', 'Windows/Qt6'] - 'require': - 'frameworks/extra-cmake-modules': '@latest-kf6' - 'frameworks/kguiaddons': '@latest-kf6' - 'frameworks/ki18n': '@latest-kf6' - 'frameworks/kiconthemes': '@latest-kf6' - 'frameworks/knewstuff': '@latest-kf6' - 'frameworks/kxmlgui': '@latest-kf6' - -- 'on': ['Linux/Qt6', 'FreeBSD/Qt6', 'Windows/Qt6'] - 'require': - 'libraries/ktexttemplate': '@stable' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-23.04.3/CMakeLists.txt new/grantleetheme-23.08.0/CMakeLists.txt --- old/grantleetheme-23.04.3/CMakeLists.txt 2023-07-04 07:14:48.000000000 +0200 +++ new/grantleetheme-23.08.0/CMakeLists.txt 2023-08-12 08:00:17.000000000 +0200 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(KF_MIN_VERSION "5.103.0") -set(PIM_VERSION "5.23.3") +set(KF_MIN_VERSION "5.105.0") +set(PIM_VERSION "5.24.0") project(GrantleeTheme VERSION ${PIM_VERSION}) @@ -27,9 +27,10 @@ include(ECMQtDeclareLoggingCategory) include(ECMDeprecationSettings) include(ECMAddTests) - +include(ECMAddQch) include(KPIMGrantleeMacros) - +option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) +add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") set(GRANTLEETHEME_LIB_VERSION ${PIM_VERSION}) @@ -67,12 +68,9 @@ ########### Targets ########### -ecm_set_disabled_deprecation_versions(QT 6.4 KF 5.104.0) - - +ecm_set_disabled_deprecation_versions(QT 6.4 KF 5.105.0) option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" OFF) -option(BUILD_WITH_COMPAT_LIBS "Generate compat cmake file (Set at false will allow to co-install lib)" ON) set(COMPILE_WITH_UNITY_CMAKE_SUPPORT OFF) if (USE_UNITY_CMAKE_SUPPORT) @@ -80,12 +78,7 @@ endif() ########### CMake Config Files ########### set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim${KF_MAJOR_VERSION}GrantleeTheme") -set(GRANTLEETHEME_KF5_COMPAT FALSE) -configure_package_config_file( - "${CMAKE_CURRENT_SOURCE_DIR}/KPimGrantleeThemeConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}GrantleeThemeConfig.cmake" - INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} -) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}GrantleeThemeConfig.cmake" @@ -101,43 +94,29 @@ DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/GrantleeTheme COMPONENT Devel ) -if (BUILD_WITH_COMPAT_LIBS) -if (QT_MAJOR_VERSION STREQUAL "5") -## -# TODO: Backwards compatiblity. Remove in next major version -## -set(CMAKECONFIG_INSTALL_DIR_KF5 "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5GrantleeTheme") -set(GRANTLEETHEME_KF5_COMPAT TRUE) -configure_package_config_file( - "${CMAKE_CURRENT_SOURCE_DIR}/KPimGrantleeThemeConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/KF5GrantleeThemeConfig.cmake" - INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR_KF5} -) - -install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/KF5GrantleeThemeConfig.cmake" - DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" - COMPONENT Devel -) -install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}GrantleeThemeConfigVersion.cmake" - RENAME "KF5GrantleeThemeConfigVersion.cmake" - DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" - COMPONENT Devel -) -install(EXPORT KPim${KF_MAJOR_VERSION}GrantleeThemeTargets - DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" - FILE KPim${KF_MAJOR_VERSION}GrantleeThemeTargets.cmake - NAMESPACE KF5:: -) -endif() -endif() add_subdirectory(src) if (BUILD_TESTING) find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Test) add_subdirectory(autotest) endif() + +if (BUILD_QCH) + ecm_install_qch_export( + TARGETS KPim${KF_MAJOR_VERSION}GrantleeTheme_QCH + FILE KPim${KF_MAJOR_VERSION}GrantleeThemeQchTargets.cmake + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + COMPONENT Devel + ) + set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KPim${KF_MAJOR_VERSION}GrantleeThemeQchTargets.cmake\")") +endif() + +configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/KPimGrantleeThemeConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}GrantleeThemeConfig.cmake" + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} +) + kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT) ki18n_install(po) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-23.04.3/CMakePresets.json new/grantleetheme-23.08.0/CMakePresets.json --- old/grantleetheme-23.04.3/CMakePresets.json 2023-07-04 07:14:48.000000000 +0200 +++ new/grantleetheme-23.08.0/CMakePresets.json 2023-08-12 08:00:17.000000000 +0200 @@ -41,6 +41,31 @@ ] }, { + "name": "dev-qch", + "displayName": "Build as debug", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", + "BUILD_QCH": "ON" + }, + "inherits": [ + "base" + ] + }, + { + "name": "dev-qt6-qch", + "displayName": "Build as debug", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", + "BUILD_QCH": "ON" + }, + "inherits": [ + "base-qt6" + ] + }, + + { "name": "dev-qt6", "displayName": "Build against qt6", "binaryDir": "${sourceDir}/build-qt6", @@ -158,11 +183,19 @@ "name": "dev-mold", "configurePreset": "dev-mold" }, + { + "name": "dev-qch", + "configurePreset": "dev-qch" + }, { "name": "dev-qt6", "configurePreset": "dev-qt6" }, { + "name": "dev-qt6-qch", + "configurePreset": "dev-qt6-qch" + }, + { "name": "dev-clang", "configurePreset": "dev-clang" }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-23.04.3/KPimGrantleeThemeConfig.cmake.in new/grantleetheme-23.08.0/KPimGrantleeThemeConfig.cmake.in --- old/grantleetheme-23.04.3/KPimGrantleeThemeConfig.cmake.in 2023-07-04 07:14:48.000000000 +0200 +++ new/grantleetheme-23.08.0/KPimGrantleeThemeConfig.cmake.in 2023-08-12 08:00:17.000000000 +0200 @@ -8,14 +8,5 @@ find_dependency(KF6TextTemplate) endif() -if (@GRANTLEETHEME_KF5_COMPAT@) - message(WARNING "\n" - "************* DEPRECATION WARNING *************\n" - "Using find_package(KF5GrantleeTheme) and KF5::GrantleeTheme targets is deprecated. " - "Please use find_package(KPim@KF_MAJOR_VERSION@GrantleeTheme) and KPim@KF_MAJOR_VERSION@::GrantleeTheme instead. This backwards " - "compatibility will be removed in the next major version.\n" - "***********************************************\n") -endif() - - include("${CMAKE_CURRENT_LIST_DIR}/KPim@[email protected]") +@PACKAGE_INCLUDE_QCHTARGETS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-23.04.3/po/ca/libgrantleetheme.po new/grantleetheme-23.08.0/po/ca/libgrantleetheme.po --- old/grantleetheme-23.04.3/po/ca/libgrantleetheme.po 2023-07-04 07:14:48.000000000 +0200 +++ new/grantleetheme-23.08.0/po/ca/libgrantleetheme.po 2023-08-12 08:00:17.000000000 +0200 @@ -50,6 +50,3 @@ #, kde-format msgid "Download new Templates..." msgstr "Baixa plantilles noves..." - -#~ msgid "Download New Themes..." -#~ msgstr "Baixa temes nous..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-23.04.3/po/eo/libgrantleetheme.po new/grantleetheme-23.08.0/po/eo/libgrantleetheme.po --- old/grantleetheme-23.04.3/po/eo/libgrantleetheme.po 1970-01-01 01:00:00.000000000 +0100 +++ new/grantleetheme-23.08.0/po/eo/libgrantleetheme.po 2023-08-12 08:00:17.000000000 +0200 @@ -0,0 +1,48 @@ +# translation of libgrantleetheme.pot to esperanto +# Copyright (C) 2022 Free Software Foundation, Inc. +# This file is distributed under the same license as the grantleetheme package. +# Oliver Kellogg <[email protected], 2023. +# +msgid "" +msgstr "" +"Project-Id-Version: grantleetheme\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n"; +"POT-Creation-Date: 2022-05-17 00:45+0000\n" +"PO-Revision-Date: 2023-07-02 22:07+0100\n" +"Last-Translator: Oliver Kellogg <[email protected]>\n" +"Language-Team: Esperanto <[email protected]>\n" +"Language: eo\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#: grantleetheme.cpp:93 grantleetheme.cpp:101 +#, kde-format +msgid "Template" +msgstr "Åablono" + +#: grantleetheme.cpp:93 grantleetheme.cpp:101 +#, kde-format +msgid "Error message" +msgstr "ErarmesaÄo" + +#: grantleetheme.cpp:108 +#, kde-format +msgid "(null template)" +msgstr "(nula Åablono)" + +#: grantleetheme.cpp:225 +#, kde-format +msgid "Template parsing error" +msgstr "Åablonanaliza eraro" + +#: grantleetheme.cpp:234 +#, kde-format +msgid "Template rendering error" +msgstr "Åablonbildiga eraro" + +#: grantleethememanager.cpp:42 +#, kde-format +msgid "Download new Templates..." +msgstr "ElÅuti novajn Åablonojn..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-23.04.3/po/hi/libgrantleetheme.po new/grantleetheme-23.08.0/po/hi/libgrantleetheme.po --- old/grantleetheme-23.04.3/po/hi/libgrantleetheme.po 2023-07-04 07:14:48.000000000 +0200 +++ new/grantleetheme-23.08.0/po/hi/libgrantleetheme.po 2023-08-12 08:00:17.000000000 +0200 @@ -3,20 +3,21 @@ # # Sameer Singh <[email protected]>, 2021. # Raghavendra Kamath <[email protected]>, 2021. +# G Karunakar <[email protected]>, 2023. msgid "" msgstr "" "Project-Id-Version: grantleetheme\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-05-17 00:45+0000\n" -"PO-Revision-Date: 2021-06-15 13:24+0530\n" -"Last-Translator: Raghavendra Kamath <[email protected]>\n" -"Language-Team: kde-hindi\n" +"PO-Revision-Date: 2023-07-06 18:19+0530\n" +"Last-Translator: G Karunakar <[email protected]>\n" +"Language-Team: Hindi <[email protected]>\n" "Language: hi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -"X-Generator: Lokalize 21.04.2\n" +"X-Generator: Lokalize 20.12.0\n" #: grantleetheme.cpp:93 grantleetheme.cpp:101 #, kde-format @@ -44,10 +45,9 @@ msgstr "साà¤à¤à¤¾ रà¥à¤à¤¡à¤°à¤¿à¤à¤ तà¥à¤°à¥à¤à¤¿" #: grantleethememanager.cpp:42 -#, fuzzy, kde-format -#| msgid "Download New Themes..." +#, kde-format msgid "Download new Templates..." -msgstr "नठपà¥à¤°à¤¸à¤à¤ डाà¤à¤¨à¤²à¥à¤¡ à¤à¤°à¥à¤..." +msgstr "नठसाà¤à¤à¥ डाà¤à¤¨à¤²à¥à¤¡ à¤à¤°à¥à¤..." #~ msgid "Download New Themes..." #~ msgstr "नठपà¥à¤°à¤¸à¤à¤ डाà¤à¤¨à¤²à¥à¤¡ à¤à¤°à¥à¤..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-23.04.3/po/zh_CN/libgrantleetheme.po new/grantleetheme-23.08.0/po/zh_CN/libgrantleetheme.po --- old/grantleetheme-23.04.3/po/zh_CN/libgrantleetheme.po 2023-07-04 07:14:48.000000000 +0200 +++ new/grantleetheme-23.08.0/po/zh_CN/libgrantleetheme.po 2023-08-12 08:00:17.000000000 +0200 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-05-17 00:45+0000\n" -"PO-Revision-Date: 2023-07-03 11:41\n" +"PO-Revision-Date: 2023-08-02 12:44\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-23.04.3/src/CMakeLists.txt new/grantleetheme-23.08.0/src/CMakeLists.txt --- old/grantleetheme-23.04.3/src/CMakeLists.txt 2023-07-04 07:14:48.000000000 +0200 +++ new/grantleetheme-23.08.0/src/CMakeLists.txt 2023-08-12 08:00:17.000000000 +0200 @@ -2,7 +2,6 @@ add_library(KPim${KF_MAJOR_VERSION}GrantleeTheme) add_library(KPim${KF_MAJOR_VERSION}::GrantleeTheme ALIAS KPim${KF_MAJOR_VERSION}GrantleeTheme) -add_library(KF5::GrantleeTheme ALIAS KPim${KF_MAJOR_VERSION}GrantleeTheme) add_subdirectory(plugin) @@ -95,4 +94,27 @@ DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) +if (BUILD_QCH) + ecm_add_qch( + KPim${KF_MAJOR_VERSION}GrantleeTheme_QCH + NAME GrantleeTheme + BASE_NAME KPim${KF_MAJOR_VERSION}GrantleeTheme + VERSION ${PIM_VERSION} + ORG_DOMAIN org.kde + SOURCES # using only public headers, to cover only public API + ${GrantleeTheme_HEADERS} + MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md" + #IMAGE_DIRS "${CMAKE_SOURCE_DIR}/docs/pics" + LINK_QCHS + Qt${QT_MAJOR_VERSION}Core_QCH + INCLUDE_DIRS + ${CMAKE_CURRENT_BINARY_DIR} + BLANK_MACROS + GRANTLEETHEME_EXPORT + TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} + QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} + COMPONENT Devel + ) +endif() + ecm_qt_install_logging_categories(EXPORT LIBGRANTLEETHEME FILE grantleetheme.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-23.04.3/src/grantleeki18nlocalizer.cpp new/grantleetheme-23.08.0/src/grantleeki18nlocalizer.cpp --- old/grantleetheme-23.04.3/src/grantleeki18nlocalizer.cpp 2023-07-04 07:14:48.000000000 +0200 +++ new/grantleetheme-23.08.0/src/grantleeki18nlocalizer.cpp 2023-08-12 08:00:17.000000000 +0200 @@ -90,14 +90,14 @@ str = str.subs(iter->toDouble()); break; case QMetaType::User: + default: if (iter->canConvert<KTextTemplate::SafeString>()) { str = str.subs(iter->value<KTextTemplate::SafeString>().get()); break; + } else { + qCWarning(GRANTLEETHEME_LOG) << "Unknown type" << iter->typeName() << "(" << iter->userType() << ")"; + break; } - // fall-through - default: - qCWarning(GRANTLEETHEME_LOG) << "Unknown type" << iter->typeName() << "(" << iter->userType() << ")"; - break; } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-23.04.3/src/grantleeki18nlocalizer.h new/grantleetheme-23.08.0/src/grantleeki18nlocalizer.h --- old/grantleetheme-23.04.3/src/grantleeki18nlocalizer.h 2023-07-04 07:14:48.000000000 +0200 +++ new/grantleetheme-23.08.0/src/grantleeki18nlocalizer.h 2023-08-12 08:00:17.000000000 +0200 @@ -52,7 +52,7 @@ void setApplicationDomain(const QByteArray &domain); private: - Q_REQUIRED_RESULT QString processArguments(const KLocalizedString &str, const QVariantList &arguments) const; + Q_REQUIRED_RESULT GRANTLEETHEME_NO_EXPORT QString processArguments(const KLocalizedString &str, const QVariantList &arguments) const; QByteArray mApplicationDomain; }; }
