Hello community, here is the log from the commit of package grantleetheme for openSUSE:Leap:15.2 checked in at 2020-05-12 11:33:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/grantleetheme (Old) and /work/SRC/openSUSE:Leap:15.2/.grantleetheme.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grantleetheme" Tue May 12 11:33:16 2020 rev:59 rq:797330 version:20.04.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/grantleetheme/grantleetheme.changes 2020-03-15 07:10:05.812917954 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.grantleetheme.new.2738/grantleetheme.changes 2020-05-12 11:33:17.335856358 +0200 @@ -1,0 +2,31 @@ +Thu Apr 23 12:21:57 UTC 2020 - Luca Beltrame <[email protected]> + +- Update to 20.04.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/2020-04-apps-update +- Changes since 20.03.90: + * Use QLatin1Char('/') here + +------------------------------------------------------------------- +Sun Apr 5 20:29:42 UTC 2020 - Luca Beltrame <[email protected]> + +- Update to 20.03.90 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/20.04-rc +- No code change since 20.03.80 + +------------------------------------------------------------------- +Sun Mar 22 09:16:38 UTC 2020 - Luca Beltrame <[email protected]> + +- Update to 20.03.80 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/20.04-beta +- Changes since 19.12.3: + * Autogenerate categories file + * Port away from about to be deprecated IconSize() method + * We depend against qt5.12 + +------------------------------------------------------------------- Old: ---- grantleetheme-19.12.3.tar.xz grantleetheme-19.12.3.tar.xz.sig New: ---- grantleetheme-20.04.0.tar.xz grantleetheme-20.04.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grantleetheme.spec ++++++ --- /var/tmp/diff_new_pack.leKfJb/_old 2020-05-12 11:33:17.671857064 +0200 +++ /var/tmp/diff_new_pack.leKfJb/_new 2020-05-12 11:33:17.675857073 +0200 @@ -21,17 +21,13 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: grantleetheme -Version: 19.12.3 +Version: 20.04.0 Release: 0 Summary: Grantlee theme support License: GPL-2.0-only Group: System/Libraries URL: https://www.kde.org Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz -%if %{with lang} -Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig -Source2: applications.keyring -%endif BuildRequires: extra-cmake-modules >= 5.19.0 BuildRequires: kf5-filesystem BuildRequires: cmake(Grantlee5) @@ -42,8 +38,12 @@ BuildRequires: cmake(Qt5Network) >= 5.4.0 BuildRequires: cmake(Qt5Test) >= 5.4.0 BuildRequires: cmake(Qt5Widgets) >= 5.4.0 -%requires_eq grantlee5 %if %{with lang} +Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig +Source2: applications.keyring +%endif +%if %{with lang} +%requires_eq grantlee5 Recommends: %{name}-lang %endif ++++++ grantleetheme-19.12.3.tar.xz -> grantleetheme-20.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.12.3/.gitignore new/grantleetheme-20.04.0/.gitignore --- old/grantleetheme-19.12.3/.gitignore 2020-02-07 07:13:55.000000000 +0100 +++ new/grantleetheme-20.04.0/.gitignore 2020-04-07 07:19:56.000000000 +0200 @@ -14,8 +14,7 @@ .swp.* Doxyfile Makefile -avail -random_seed /build*/ +.cmake/ CMakeLists.txt.user* *.unc-backup* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.12.3/CMakeLists.txt new/grantleetheme-20.04.0/CMakeLists.txt --- old/grantleetheme-19.12.3/CMakeLists.txt 2020-03-03 01:38:29.000000000 +0100 +++ new/grantleetheme-20.04.0/CMakeLists.txt 2020-04-17 02:40:45.000000000 +0200 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_MIN_VERSION "5.63.0") -set(PIM_VERSION "5.13.3") +set(KF5_MIN_VERSION "5.68.0") +set(PIM_VERSION "5.14.0") project(GrantleeTheme VERSION ${PIM_VERSION}) @@ -32,7 +32,7 @@ set(GRANTLEETHEME_LIB_VERSION ${PIM_VERSION}) -set(QT_REQUIRED_VERSION "5.11.0") +set(QT_REQUIRED_VERSION "5.12.0") set(GRANTLEE_VERSION "5.1") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Network) @@ -53,7 +53,7 @@ if (EXISTS "${CMAKE_SOURCE_DIR}/.git") add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00) - add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054000) + add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054400) endif() add_definitions(-DQT_NO_FOREACH) @@ -89,8 +89,6 @@ add_subdirectory(autotest) endif() -install(FILES grantleetheme.renamecategories grantleetheme.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) ki18n_install(po) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.12.3/autotest/grantleethemetest.cpp new/grantleetheme-20.04.0/autotest/grantleethemetest.cpp --- old/grantleetheme-19.12.3/autotest/grantleethemetest.cpp 2020-02-07 07:13:55.000000000 +0100 +++ new/grantleetheme-20.04.0/autotest/grantleethemetest.cpp 2020-04-07 07:19:56.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (c) 2014-2019 Montel Laurent <[email protected]> + Copyright (c) 2014-2020 Laurent Montel <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -211,8 +211,8 @@ QVERIFY(validateHtml(themePath, templateBasename, result)); QVERIFY(compareHtml(themePath, templateBasename)); - QFile::remove(themePath + QDir::separator() + templateBasename + QStringLiteral(".out")); - QFile::remove(themePath + QDir::separator() + templateBasename + QStringLiteral(".out.html")); + QFile::remove(themePath + QLatin1Char('/') + templateBasename + QStringLiteral(".out")); + QFile::remove(themePath + QLatin1Char('/') + templateBasename + QStringLiteral(".out.html")); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.12.3/autotest/grantleethemetest.h new/grantleetheme-20.04.0/autotest/grantleethemetest.h --- old/grantleetheme-19.12.3/autotest/grantleethemetest.h 2020-02-07 07:13:55.000000000 +0100 +++ new/grantleetheme-20.04.0/autotest/grantleethemetest.h 2020-04-07 07:19:56.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (c) 2014-2019 Montel Laurent <[email protected]> + Copyright (c) 2014-2020 Laurent Montel <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.12.3/grantleetheme.categories new/grantleetheme-20.04.0/grantleetheme.categories --- old/grantleetheme-19.12.3/grantleetheme.categories 2020-02-07 07:13:55.000000000 +0100 +++ new/grantleetheme-20.04.0/grantleetheme.categories 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -org.kde.pim.grantleetheme kdepim (grantleetheme) IDENTIFIER [GRANTLEETHEME_LOG] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.12.3/grantleetheme.renamecategories new/grantleetheme-20.04.0/grantleetheme.renamecategories --- old/grantleetheme-19.12.3/grantleetheme.renamecategories 2020-02-07 07:13:55.000000000 +0100 +++ new/grantleetheme-20.04.0/grantleetheme.renamecategories 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -log_grantleetheme org.kde.pim.grantleetheme diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.12.3/po/en_GB/libgrantleetheme.po new/grantleetheme-20.04.0/po/en_GB/libgrantleetheme.po --- old/grantleetheme-19.12.3/po/en_GB/libgrantleetheme.po 2020-03-03 01:38:26.000000000 +0100 +++ new/grantleetheme-20.04.0/po/en_GB/libgrantleetheme.po 2020-04-17 02:40:44.000000000 +0200 @@ -9,7 +9,7 @@ "POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2017-05-21 16:36+0000\n" "Last-Translator: Steve Allewell <[email protected]>\n" -"Language-Team: English <[email protected]>\n" +"Language-Team: British English <[email protected]>\n" "Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.12.3/po/et/libgrantleetheme.po new/grantleetheme-20.04.0/po/et/libgrantleetheme.po --- old/grantleetheme-19.12.3/po/et/libgrantleetheme.po 2020-03-03 01:38:26.000000000 +0100 +++ new/grantleetheme-20.04.0/po/et/libgrantleetheme.po 2020-04-17 02:40:44.000000000 +0200 @@ -1,21 +1,21 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Marek Laane <[email protected]>, 2014, 2016. +# Marek Laane <[email protected]>, 2014, 2016, 2019. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2019-05-20 03:14+0200\n" -"PO-Revision-Date: 2016-07-26 20:43+0300\n" +"PO-Revision-Date: 2019-11-16 21:08+0200\n" "Last-Translator: Marek Laane <[email protected]>\n" -"Language-Team: Estonian <[email protected]>\n" +"Language-Team: Estonian <[email protected]>\n" "Language: et\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 1.5\n" +"X-Generator: Lokalize 19.08.1\n" #: grantleetheme.cpp:99 #, kde-format @@ -28,10 +28,9 @@ msgstr "Veateade" #: grantleetheme.cpp:107 -#, fuzzy, kde-format -#| msgid "Template" +#, kde-format msgid "(null template)" -msgstr "Mall" +msgstr "(nullmall)" #: grantleetheme.cpp:215 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.12.3/po/ia/libgrantleetheme.po new/grantleetheme-20.04.0/po/ia/libgrantleetheme.po --- old/grantleetheme-19.12.3/po/ia/libgrantleetheme.po 2020-03-03 01:38:27.000000000 +0100 +++ new/grantleetheme-20.04.0/po/ia/libgrantleetheme.po 2020-04-17 02:40:45.000000000 +0200 @@ -7,15 +7,15 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2019-05-20 03:14+0200\n" -"PO-Revision-Date: 2020-02-07 23:31+0100\n" -"Last-Translator: Giovanni Sora <[email protected]>\n" -"Language-Team: Interlingua <[email protected]>\n" +"PO-Revision-Date: 2020-02-12 13:28+0100\n" +"Last-Translator: giovanni <[email protected]>\n" +"Language-Team: Interlingua <[email protected]>\n" "Language: ia\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 2.0\n" +"X-Generator: Lokalize 18.12.3\n" #: grantleetheme.cpp:99 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.12.3/po/nb/libgrantleetheme.po new/grantleetheme-20.04.0/po/nb/libgrantleetheme.po --- old/grantleetheme-19.12.3/po/nb/libgrantleetheme.po 2020-03-03 01:38:28.000000000 +0100 +++ new/grantleetheme-20.04.0/po/nb/libgrantleetheme.po 2020-04-17 02:40:45.000000000 +0200 @@ -8,7 +8,7 @@ "POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2013-10-01 23:22+0200\n" "Last-Translator: Bjørn Steensrud <[email protected]>\n" -"Language-Team: Norwegian Bokmål <[email protected]>\n" +"Language-Team: Norwegian Bokmål <[email protected]>\n" "Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.12.3/po/zh_CN/libgrantleetheme.po new/grantleetheme-20.04.0/po/zh_CN/libgrantleetheme.po --- old/grantleetheme-19.12.3/po/zh_CN/libgrantleetheme.po 2020-03-03 01:38:29.000000000 +0100 +++ new/grantleetheme-20.04.0/po/zh_CN/libgrantleetheme.po 2020-04-17 02:40:45.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2019-05-20 03:14+0200\n" -"PO-Revision-Date: 2020-01-20 21:56\n" +"PO-Revision-Date: 2020-03-25 19:56\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.12.3/src/CMakeLists.txt new/grantleetheme-20.04.0/src/CMakeLists.txt --- old/grantleetheme-19.12.3/src/CMakeLists.txt 2020-02-07 07:13:55.000000000 +0100 +++ new/grantleetheme-20.04.0/src/CMakeLists.txt 2020-04-07 07:19:56.000000000 +0200 @@ -13,7 +13,10 @@ configure_file(config-grantleetheme.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-grantleetheme.h) -ecm_qt_declare_logging_category(libgrantleetheme_SRCS HEADER grantleetheme_debug.h IDENTIFIER GRANTLEETHEME_LOG CATEGORY_NAME org.kde.pim.grantleetheme) +ecm_qt_declare_logging_category(libgrantleetheme_SRCS HEADER grantleetheme_debug.h IDENTIFIER GRANTLEETHEME_LOG CATEGORY_NAME org.kde.pim.grantleetheme + OLD_CATEGORY_NAMES log_grantleetheme + DESCRIPTION "kdepim (grantleetheme)" EXPORT LIBGRANTLEETHEME) + add_library(KF5GrantleeTheme ${libgrantleetheme_SRCS}) generate_export_header(KF5GrantleeTheme BASE_NAME grantleetheme) @@ -76,3 +79,6 @@ install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) + + +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-19.12.3/src/genericformatter.cpp new/grantleetheme-20.04.0/src/genericformatter.cpp --- old/grantleetheme-19.12.3/src/genericformatter.cpp 2020-02-07 07:13:55.000000000 +0100 +++ new/grantleetheme-20.04.0/src/genericformatter.cpp 2020-04-07 07:19:56.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (c) 2016-2019 Montel Laurent <[email protected]> + Copyright (c) 2016-2020 Laurent Montel <[email protected]> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.12.3/src/genericformatter.h new/grantleetheme-20.04.0/src/genericformatter.h --- old/grantleetheme-19.12.3/src/genericformatter.h 2020-02-07 07:13:55.000000000 +0100 +++ new/grantleetheme-20.04.0/src/genericformatter.h 2020-04-07 07:19:56.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (c) 2016-2019 Montel Laurent <[email protected]> + Copyright (c) 2016-2020 Laurent Montel <[email protected]> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.12.3/src/grantleetheme.cpp new/grantleetheme-20.04.0/src/grantleetheme.cpp --- old/grantleetheme-19.12.3/src/grantleetheme.cpp 2020-02-07 07:13:55.000000000 +0100 +++ new/grantleetheme-20.04.0/src/grantleetheme.cpp 2020-04-07 07:19:56.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013-2019 Montel Laurent <[email protected]> + Copyright (c) 2013-2020 Laurent Montel <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -117,7 +117,7 @@ Theme::Theme(const QString &themePath, const QString &dirName, const QString &defaultDesktopFileName) : d(new ThemePrivate) { - const QString themeInfoFile = themePath + QDir::separator() + defaultDesktopFileName; + const QString themeInfoFile = themePath + QLatin1Char('/') + defaultDesktopFileName; KConfig config(themeInfoFile); KConfigGroup group(&config, QStringLiteral("Desktop Entry")); if (group.isValid()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.12.3/src/grantleetheme.h new/grantleetheme-20.04.0/src/grantleetheme.h --- old/grantleetheme-19.12.3/src/grantleetheme.h 2020-02-07 07:13:55.000000000 +0100 +++ new/grantleetheme-20.04.0/src/grantleetheme.h 2020-04-07 07:19:56.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013-2019 Montel Laurent <[email protected]> + Copyright (c) 2013-2020 Laurent Montel <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.12.3/src/grantleetheme_p.h new/grantleetheme-20.04.0/src/grantleetheme_p.h --- old/grantleetheme-19.12.3/src/grantleetheme_p.h 2020-02-07 07:13:55.000000000 +0100 +++ new/grantleetheme-20.04.0/src/grantleetheme_p.h 2020-04-07 07:19:56.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013-2019 Montel Laurent <[email protected]> + Copyright (c) 2013-2020 Laurent Montel <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.12.3/src/grantleethememanager.cpp new/grantleetheme-20.04.0/src/grantleethememanager.cpp --- old/grantleetheme-19.12.3/src/grantleethememanager.cpp 2020-02-07 07:13:55.000000000 +0100 +++ new/grantleetheme-20.04.0/src/grantleethememanager.cpp 2020-04-07 07:19:56.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013-2019 Montel Laurent <[email protected]> + Copyright (c) 2013-2020 Laurent Montel <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.12.3/src/grantleethememanager.h new/grantleetheme-20.04.0/src/grantleethememanager.h --- old/grantleetheme-19.12.3/src/grantleethememanager.h 2020-02-07 07:13:55.000000000 +0100 +++ new/grantleetheme-20.04.0/src/grantleethememanager.h 2020-04-07 07:19:56.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013-2019 Montel Laurent <[email protected]> + Copyright (c) 2013-2020 Laurent Montel <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.12.3/src/plugin/icon.cpp new/grantleetheme-20.04.0/src/plugin/icon.cpp --- old/grantleetheme-19.12.3/src/plugin/icon.cpp 2020-02-07 07:13:55.000000000 +0100 +++ new/grantleetheme-20.04.0/src/plugin/icon.cpp 2020-04-07 07:19:56.000000000 +0200 @@ -138,7 +138,7 @@ const QString html = QStringLiteral("<img src=\"file://%1\" align=\"top\" height=\"%2\" width=\"%2\" alt=\"%3\" title=\"%4\" />") .arg(KIconLoader::global()->iconPath(iconName, mSizeOrGroup < KIconLoader::LastGroup ? mSizeOrGroup : -mSizeOrGroup)) .arg(mSizeOrGroup < KIconLoader::LastGroup - ? IconSize(static_cast<KIconLoader::Group>(mSizeOrGroup)) + ? KIconLoader::global()->currentSize(static_cast<KIconLoader::Group>(mSizeOrGroup)) : mSizeOrGroup) .arg(altText.isEmpty() ? iconName : altText, altText); // title is intentionally blank if no alt is provided (*stream) << Grantlee::SafeString(html, Grantlee::SafeString::IsSafe); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.12.3/src/plugin/palette.cpp new/grantleetheme-20.04.0/src/plugin/palette.cpp --- old/grantleetheme-19.12.3/src/plugin/palette.cpp 2020-02-07 07:13:55.000000000 +0100 +++ new/grantleetheme-20.04.0/src/plugin/palette.cpp 2020-04-07 07:19:56.000000000 +0200 @@ -41,9 +41,7 @@ ROLE(LinkVisited), ROLE(Mid), ROLE(Midlight), -#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) ROLE(PlaceholderText), -#endif ROLE(Shadow), ROLE(Text), ROLE(ToolTipBase), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.12.3/src/qtresourcetemplateloader.cpp new/grantleetheme-20.04.0/src/qtresourcetemplateloader.cpp --- old/grantleetheme-19.12.3/src/qtresourcetemplateloader.cpp 2020-02-07 07:13:55.000000000 +0100 +++ new/grantleetheme-20.04.0/src/qtresourcetemplateloader.cpp 2020-04-07 07:19:56.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2019 Laurent Montel <[email protected]> + * Copyright (C) 2016-2020 Laurent Montel <[email protected]> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.12.3/src/qtresourcetemplateloader.h new/grantleetheme-20.04.0/src/qtresourcetemplateloader.h --- old/grantleetheme-19.12.3/src/qtresourcetemplateloader.h 2020-02-07 07:13:55.000000000 +0100 +++ new/grantleetheme-20.04.0/src/qtresourcetemplateloader.h 2020-04-07 07:19:56.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2019 Laurent Montel <[email protected]> + * Copyright (C) 2016-2020 Laurent Montel <[email protected]> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public
