Hello community,
here is the log from the commit of package kiconthemes for openSUSE:Factory checked in at 2018-10-22 11:12:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiconthemes (Old)
and /work/SRC/openSUSE:Factory/.kiconthemes.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiconthemes"
Mon Oct 22 11:12:53 2018 rev:61 rq:642322 version:5.51.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kiconthemes/kiconthemes.changes 2018-10-01 08:06:50.170339262 +0200
+++ /work/SRC/openSUSE:Factory/.kiconthemes.new/kiconthemes.changes 2018-10-22 11:13:00.979794274 +0200
@@ -1,0 +2,16 @@
+Tue Oct 16 08:02:15 UTC 2018 - Luca Beltrame
+
+- Run spec-cleaner
+
+-------------------------------------------------------------------
+Mon Oct 15 11:50:35 UTC 2018 - lbeltrame@kde.org
+
+- Update to 5.51.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.51.0.php
+- Changes since 5.50.0:
+ * Start drawing emblems in the bottom-right corner
+ * Fix compile with strict compiler flags
+
+-------------------------------------------------------------------
Old:
----
kiconthemes-5.50.0.tar.xz
New:
----
kiconthemes-5.51.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiconthemes.spec ++++++
--- /var/tmp/diff_new_pack.Ayk8Yv/_old 2018-10-22 11:13:02.811792814 +0200
+++ /var/tmp/diff_new_pack.Ayk8Yv/_new 2018-10-22 11:13:02.847792785 +0200
@@ -12,24 +12,24 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define lname libKF5IconThemes5
-%define _tar_path 5.50
+%define _tar_path 5.51
# 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
Name: kiconthemes
-Version: 5.50.0
+Version: 5.51.0
Release: 0
Summary: Icon GUI utilities
License: LGPL-2.1-or-later AND GPL-2.0-or-later
Group: System/GUI/KDE
-URL: http://www.kde.org
+URL: https://www.kde.org
Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
Source1: baselibs.conf
BuildRequires: cmake >= 3.0
++++++ kiconthemes-5.50.0.tar.xz -> kiconthemes-5.51.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.50.0/CMakeLists.txt new/kiconthemes-5.51.0/CMakeLists.txt
--- old/kiconthemes-5.50.0/CMakeLists.txt 2018-09-02 21:22:57.000000000 +0200
+++ new/kiconthemes-5.51.0/CMakeLists.txt 2018-10-08 10:15:39.000000000 +0200
@@ -1,12 +1,12 @@
cmake_minimum_required(VERSION 3.0)
-set(KF5_VERSION "5.50.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.50.0") # handled by release scripts
+set(KF5_VERSION "5.51.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.51.0") # handled by release scripts
project(KIconThemes VERSION ${KF5_VERSION})
# ECM setup
include(FeatureSummary)
-find_package(ECM 5.50.0 NO_MODULE)
+find_package(ECM 5.51.0 NO_MODULE)
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules")
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
@@ -52,6 +52,11 @@
if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
ki18n_install(po)
endif()
+#add_definitions(-DQT_NO_CAST_FROM_ASCII)
+add_definitions(-DQT_NO_CAST_TO_ASCII)
+add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT)
+add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
+add_definitions(-DQT_USE_QSTRINGBUILDER)
add_subdirectory(src)
if (BUILD_TESTING)
add_subdirectory(tests)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.50.0/autotests/kiconengine_unittest.cpp new/kiconthemes-5.51.0/autotests/kiconengine_unittest.cpp
--- old/kiconthemes-5.50.0/autotests/kiconengine_unittest.cpp 2018-09-02 21:22:57.000000000 +0200
+++ new/kiconthemes-5.51.0/autotests/kiconengine_unittest.cpp 2018-10-08 10:15:39.000000000 +0200
@@ -37,7 +37,7 @@
QStandardPaths::setTestModeEnabled(true);
// Remove icon cache
- const QString cacheFile = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + "/icon-cache.kcache";
+ const QString cacheFile = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QStringLiteral("/icon-cache.kcache");
QFile::remove(cacheFile);
KConfigGroup cg(KSharedConfig::openConfig(), "Icons");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.50.0/autotests/kiconloader_benchmark.cpp new/kiconthemes-5.51.0/autotests/kiconloader_benchmark.cpp
--- old/kiconthemes-5.50.0/autotests/kiconloader_benchmark.cpp 2018-09-02 21:22:57.000000000 +0200
+++ new/kiconthemes-5.51.0/autotests/kiconloader_benchmark.cpp 2018-10-08 10:15:39.000000000 +0200
@@ -104,7 +104,7 @@
{
QBENCHMARK {
// Remove icon cache
- const QString cacheFile = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + "/icon-cache.kcache";
+ const QString cacheFile = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QStringLiteral("/icon-cache.kcache");
QFile::remove(cacheFile);
// Clear SHM cache
KIconLoader::global()->reconfigure(QString());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.50.0/autotests/kiconloader_rcctest.cpp new/kiconthemes-5.51.0/autotests/kiconloader_rcctest.cpp
--- old/kiconthemes-5.50.0/autotests/kiconloader_rcctest.cpp 2018-09-02 21:22:57.000000000 +0200
+++ new/kiconthemes-5.51.0/autotests/kiconloader_rcctest.cpp 2018-10-08 10:15:39.000000000 +0200
@@ -33,14 +33,14 @@
// This must be done before QCoreApplication is even created, given the Q_COREAPP_STARTUP_FUNCTION in kiconthemes
void earlyInit()
{
- QStandardPaths::enableTestMode(true);
+ QStandardPaths::setTestModeEnabled(true);
qputenv("XDG_DATA_DIRS", "/doesnotexist"); // ensure hicolor/oxygen/breeze are not found
QFile rcc(QStringLiteral("icontheme.rcc"));
Q_ASSERT(rcc.exists());
QCoreApplication::setApplicationName(QStringLiteral("myappname")); // for a fixed location on Unix (appname is empty here otherwise)
const QString destDir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
QDir().mkpath(destDir);
- const QString dest = destDir + "/icontheme.rcc";
+ const QString dest = destDir + QStringLiteral("/icontheme.rcc");
QFile::remove(dest);
if (!rcc.copy(dest)) {
qWarning() << "Error copying to" << dest;
@@ -56,7 +56,7 @@
void initTestCase()
{
// Remove icon cache
- const QString cacheFile = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + "/icon-cache.kcache";
+ const QString cacheFile = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QStringLiteral("/icon-cache.kcache");
QFile::remove(cacheFile);
// Clear SHM cache
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.50.0/autotests/kiconloader_resourcethemetest.cpp new/kiconthemes-5.51.0/autotests/kiconloader_resourcethemetest.cpp
--- old/kiconthemes-5.50.0/autotests/kiconloader_resourcethemetest.cpp 2018-09-02 21:22:57.000000000 +0200
+++ new/kiconthemes-5.51.0/autotests/kiconloader_resourcethemetest.cpp 2018-10-08 10:15:39.000000000 +0200
@@ -48,7 +48,7 @@
KIconLoader::global()->loadIcon(QStringLiteral("someiconintheme"), KIconLoader::Desktop, 22,
KIconLoader::DefaultState, QStringList(),
&path);
- QCOMPARE(path, QString(":/icons/themeinresource/22x22/appsNoContext/someiconintheme.png"));
+ QCOMPARE(path, QStringLiteral(":/icons/themeinresource/22x22/appsNoContext/someiconintheme.png"));
}
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.50.0/autotests/kiconloader_unittest.cpp new/kiconthemes-5.51.0/autotests/kiconloader_unittest.cpp
--- old/kiconthemes-5.50.0/autotests/kiconloader_unittest.cpp 2018-09-02 21:22:57.000000000 +0200
+++ new/kiconthemes-5.51.0/autotests/kiconloader_unittest.cpp 2018-10-08 10:15:39.000000000 +0200
@@ -132,7 +132,7 @@
QPixmap img(i, i);
img.fill(Qt::red);
- QVERIFY(img.save(dir + "/red.png"));
+ QVERIFY(img.save(dir + QStringLiteral("/red.png")));
dirs += relDir;
KConfigGroup dirGroup = configFile.group(relDir);
@@ -157,7 +157,7 @@
void init()
{
// Remove icon cache
- const QString cacheFile = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + "/icon-cache.kcache";
+ const QString cacheFile = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QStringLiteral("/icon-cache.kcache");
QFile::remove(cacheFile);
// Clear SHM cache
@@ -242,7 +242,7 @@
{
KIconLoader appIconLoader(appName);
QString iconPath = appIconLoader.iconPath(QStringLiteral("image1"), KIconLoader::User);
- QCOMPARE(iconPath, appDataDir.filePath("pics/image1.png"));
+ QCOMPARE(iconPath, appDataDir.filePath(QStringLiteral("pics/image1.png")));
QVERIFY(QFile::exists(iconPath));
// Load it again, to use the "last loaded" cache
@@ -250,7 +250,7 @@
QCOMPARE(iconPath, iconPath2);
// Load something else, to clear the "last loaded" cache
QString iconPathTextEdit = appIconLoader.iconPath(QStringLiteral("image2"), KIconLoader::User);
- QCOMPARE(iconPathTextEdit, appDataDir.filePath("pics/image2.png"));
+ QCOMPARE(iconPathTextEdit, appDataDir.filePath(QStringLiteral("pics/image2.png")));
QVERIFY(QFile::exists(iconPathTextEdit));
// Now load kdialog again, to use the real kiconcache
iconPath2 = appIconLoader.iconPath(QStringLiteral("image1"), KIconLoader::User);
@@ -284,19 +284,19 @@
QTest::addColumn<QString>("iconName");
QTest::addColumn<QString>("expectedFileName");
- QTest::newRow("existing icon") << "text-plain" << "text-plain.png";
- QTest::newRow("octet-stream icon") << "application-octet-stream" << "application-octet-stream.png";
- QTest::newRow("non-existing icon") << "foo-bar" << "application-octet-stream.png";
+ QTest::newRow("existing icon") << QStringLiteral("text-plain") << QStringLiteral("text-plain.png");
+ QTest::newRow("octet-stream icon") << QStringLiteral("application-octet-stream") << QStringLiteral("application-octet-stream.png");
+ QTest::newRow("non-existing icon") << QStringLiteral("foo-bar") << QStringLiteral("application-octet-stream.png");
// Test this again, because now we won't go into the "fast path" of loadMimeTypeIcon anymore.
- QTest::newRow("existing icon again") << "text-plain" << "text-plain.png";
- QTest::newRow("generic fallback") << "image-foo-bar" << "image-x-generic.png";
- QTest::newRow("video generic fallback") << "video-foo-bar" << "video-x-generic.png";
- QTest::newRow("image-x-generic itself") << "image-x-generic" << "image-x-generic.png";
- QTest::newRow("x-office-document icon") << "x-office-document" << "x-office-document.png";
- QTest::newRow("unavailable generic icon") << "application/x-font-vfont" << "application-octet-stream.png";
- QTest::newRow("#184852") << "audio/x-tuxguitar" << "audio-x-generic.png";
- QTest::newRow("#178847") << "image/x-compressed-xcf" << "image-x-generic.png";
- QTest::newRow("mimetype generic icon") << "application-x-fluid" << "x-office-document.png";
+ QTest::newRow("existing icon again") << QStringLiteral("text-plain") << QStringLiteral("text-plain.png");
+ QTest::newRow("generic fallback") << QStringLiteral("image-foo-bar") << QStringLiteral("image-x-generic.png");
+ QTest::newRow("video generic fallback") << QStringLiteral("video-foo-bar") << QStringLiteral("video-x-generic.png");
+ QTest::newRow("image-x-generic itself") << QStringLiteral("image-x-generic") << QStringLiteral("image-x-generic.png");
+ QTest::newRow("x-office-document icon") << QStringLiteral("x-office-document") << QStringLiteral("x-office-document.png");
+ QTest::newRow("unavailable generic icon") << QStringLiteral("application/x-font-vfont") << QStringLiteral("application-octet-stream.png");
+ QTest::newRow("#184852") << QStringLiteral("audio/x-tuxguitar") << QStringLiteral("audio-x-generic.png");
+ QTest::newRow("#178847") << QStringLiteral("image/x-compressed-xcf") << QStringLiteral("image-x-generic.png");
+ QTest::newRow("mimetype generic icon") << QStringLiteral("application-x-fluid") << QStringLiteral("x-office-document.png");
}
void testLoadMimeTypeIcon()
@@ -309,7 +309,7 @@
KIconLoader::DefaultState, QStringList(),
&path);
QVERIFY(!pix.isNull());
- QCOMPARE(path.section('/', -1), expectedFileName);
+ QCOMPARE(path.section(QLatin1Char('/'), -1), expectedFileName);
// do the same test using a global iconloader, so that
// we get into the final return statement, which can only happen
@@ -325,15 +325,15 @@
void testHasIcon()
{
// Do everything twice to check code paths that might use a cache
- QVERIFY(KIconLoader::global()->hasIcon("kde"));
- QVERIFY(KIconLoader::global()->hasIcon("kde"));
+ QVERIFY(KIconLoader::global()->hasIcon(QStringLiteral("kde")));
+ QVERIFY(KIconLoader::global()->hasIcon(QStringLiteral("kde")));
KIconLoader iconLoader;
- QVERIFY(iconLoader.hasIcon("kde"));
+ QVERIFY(iconLoader.hasIcon(QStringLiteral("kde")));
- QVERIFY(KIconLoader::global()->hasIcon("process-working"));
- QVERIFY(KIconLoader::global()->hasIcon("process-working"));
- QVERIFY(!KIconLoader::global()->hasIcon("no-such-icon-exists"));
- QVERIFY(!KIconLoader::global()->hasIcon("no-such-icon-exists"));
+ QVERIFY(KIconLoader::global()->hasIcon(QStringLiteral("process-working")));
+ QVERIFY(KIconLoader::global()->hasIcon(QStringLiteral("process-working")));
+ QVERIFY(!KIconLoader::global()->hasIcon(QStringLiteral("no-such-icon-exists")));
+ QVERIFY(!KIconLoader::global()->hasIcon(QStringLiteral("no-such-icon-exists")));
}
void testIconPath()
@@ -355,7 +355,7 @@
&path);
QVERIFY(!path.isEmpty());
QVERIFY(QFile::exists(path));
- QVERIFY2(path.contains("32x32"), qPrintable(path));
+ QVERIFY2(path.contains(QStringLiteral("32x32")), qPrintable(path));
QCOMPARE(pix.size(), QSize(32, 32));
// Compare with iconPath()
@@ -368,10 +368,10 @@
&path);
QVERIFY(!path.isEmpty());
QVERIFY(QFile::exists(path));
- QVERIFY2(path.contains("22x22"), qPrintable(path));
+ QVERIFY2(path.contains(QStringLiteral("22x22")), qPrintable(path));
QCOMPARE(pix.size(), QSize(24, 24));
- QVERIFY(KIconLoader::global()->hasIcon("kde"));
+ QVERIFY(KIconLoader::global()->hasIcon(QStringLiteral("kde")));
path = QString();
KIconLoader::global()->loadIcon(QStringLiteral("does_not_exist"), KIconLoader::Desktop, 24,
@@ -437,21 +437,21 @@
KIconLoader::global()->loadIcon(QStringLiteral("iconindirectorywithoutcontext"), KIconLoader::Desktop, 24,
KIconLoader::DefaultState, QStringList(),
&path);
- QVERIFY(path.endsWith("appsNoContext/iconindirectorywithoutcontext.png"));
+ QVERIFY(path.endsWith(QLatin1String("appsNoContext/iconindirectorywithoutcontext.png")));
}
{
QString path;
KIconLoader::global()->loadIcon(QStringLiteral("iconindirectorywithouttype"), KIconLoader::Desktop, 24,
KIconLoader::DefaultState, QStringList(),
&path);
- QVERIFY(path.endsWith("appsNoType/iconindirectorywithouttype.png"));
+ QVERIFY(path.endsWith(QLatin1String("appsNoType/iconindirectorywithouttype.png")));
}
{
QString path;
KIconLoader::global()->loadIcon(QStringLiteral("iconindirectorywithoutcontextortype"), KIconLoader::Desktop, 24,
KIconLoader::DefaultState, QStringList(),
&path);
- QVERIFY(path.endsWith("appsNoContextOrType/iconindirectorywithoutcontextortype.png"));
+ QVERIFY(path.endsWith(QLatin1String("appsNoContextOrType/iconindirectorywithoutcontextortype.png")));
}
}
@@ -514,14 +514,14 @@
// Verify the ARGB hex (ff6496c8)
uintToHex(testColorNoAlpha.rgba(), argbHex.data());
- QCOMPARE(argbHex, QString("ff6496c8"));
+ QCOMPARE(argbHex, QStringLiteral("ff6496c8"));
// HEX (ARGB format without the #): 7b6496c8
QColor testColorWithAlpha(100, 150, 200, 123);
// Test uintToHex to verify its ARGB output.
uintToHex(testColorWithAlpha.rgba(), argbHex.data());
- QCOMPARE(argbHex, QString("7b6496c8"));
+ QCOMPARE(argbHex, QStringLiteral("7b6496c8"));
}
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.50.0/po/hu/kiconthemes5.po new/kiconthemes-5.51.0/po/hu/kiconthemes5.po
--- old/kiconthemes-5.50.0/po/hu/kiconthemes5.po 2018-09-02 21:22:57.000000000 +0200
+++ new/kiconthemes-5.51.0/po/hu/kiconthemes5.po 2018-10-08 10:15:39.000000000 +0200
@@ -1,19 +1,20 @@
# Kristóf Kiszel , 2010, 2011, 2012.
# Balázs Úr , 2012.
+# Kristof Kiszel , 2018.
msgid ""
msgstr ""
"Project-Id-Version: KDE 4.4\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2018-08-16 09:05+0200\n"
-"PO-Revision-Date: 2012-12-12 22:37+0100\n"
-"Last-Translator: Balázs Úr \n"
+"PO-Revision-Date: 2018-09-29 16:40+0200\n"
+"Last-Translator: Kristof Kiszel \n"
"Language-Team: Hungarian \n"
"Language: hu\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 2.0\n"
#: kicondialog.cpp:260 kicondialog.cpp:272 kicondialog.cpp:602
#, kde-format
@@ -98,11 +99,11 @@
#: kicondialog.cpp:364
#, kde-format
msgid "All"
-msgstr ""
+msgstr "Összes"
#: kicondialog.cpp:602
-#, fuzzy, kde-format
-#| msgid "*.png *.xpm *.svg *.svgz|Icon Files (*.png *.xpm *.svg *.svgz)"
+#, kde-format
msgid ""
"*.ico *.png *.xpm *.svg *.svgz|Icon Files (*.ico *.png *.xpm *.svg *.svgz)"
-msgstr "*.png *.xpm *.svg *.svgz|Ikonfájlok (*.png *.xpm *.svg *.svgz)"
+msgstr ""
+"*.ico *.png *.xpm *.svg *.svgz|Ikonfájlok (*.ico *.png *.xpm *.svg *.svgz)"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.50.0/po/ru/kiconthemes5.po new/kiconthemes-5.51.0/po/ru/kiconthemes5.po
--- old/kiconthemes-5.50.0/po/ru/kiconthemes5.po 2018-09-02 21:22:57.000000000 +0200
+++ new/kiconthemes-5.51.0/po/ru/kiconthemes5.po 2018-10-08 10:15:39.000000000 +0200
@@ -10,7 +10,7 @@
# Evgeniy Ivanov , 2008.
# Андрей Черепанов , 2009.
# Andrey Cherepanov , 2009, 2011.
-# Alexander Potashev , 2009, 2010, 2011, 2016.
+# Alexander Potashev , 2009, 2010, 2011, 2016, 2018.
# Yuri Efremov , 2011, 2012.
# Inga Barinova , 2012.
# Julia Dronova , 2012.
@@ -20,7 +20,7 @@
"Project-Id-Version: kio4\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2018-08-16 09:05+0200\n"
-"PO-Revision-Date: 2016-12-03 22:10+0300\n"
+"PO-Revision-Date: 2018-09-15 00:01+0300\n"
"Last-Translator: Alexander Potashev \n"
"Language-Team: Russian \n"
"Language: ru\n"
@@ -120,8 +120,8 @@
msgstr "Все"
#: kicondialog.cpp:602
-#, fuzzy, kde-format
-#| msgid "*.png *.xpm *.svg *.svgz|Icon Files (*.png *.xpm *.svg *.svgz)"
+#, kde-format
msgid ""
"*.ico *.png *.xpm *.svg *.svgz|Icon Files (*.ico *.png *.xpm *.svg *.svgz)"
-msgstr "*.png *.xpm *.svg *.svgz|Файлы значков (*.png *.xpm *.svg *.svgz)"
+msgstr ""
+"*.ico *.png *.xpm *.svg *.svgz|Файлы значков (*.ico *.png *.xpm *.svg *.svgz)"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.50.0/po/zh_CN/kiconthemes5.po new/kiconthemes-5.51.0/po/zh_CN/kiconthemes5.po
--- old/kiconthemes-5.50.0/po/zh_CN/kiconthemes5.po 2018-09-02 21:22:57.000000000 +0200
+++ new/kiconthemes-5.51.0/po/zh_CN/kiconthemes5.po 2018-10-08 10:15:39.000000000 +0200
@@ -17,8 +17,8 @@
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2018-08-16 09:05+0200\n"
-"PO-Revision-Date: 2018-08-30 13:09\n"
-"Last-Translator: guoyunhebrave \n"
+"PO-Revision-Date: 2018-09-28 19:47\n"
+"Last-Translator: guoyunhe \n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.50.0/src/kicondialog.cpp new/kiconthemes-5.51.0/src/kicondialog.cpp
--- old/kiconthemes-5.50.0/src/kicondialog.cpp 2018-09-02 21:22:57.000000000 +0200
+++ new/kiconthemes-5.51.0/src/kicondialog.cpp 2018-10-08 10:15:39.000000000 +0200
@@ -444,7 +444,7 @@
}
}
- qSort(filelist.begin(), filelist.end(), sortByFileName);
+ std::sort(filelist.begin(), filelist.end(), sortByFileName);
// The KIconCanvas has uniformItemSizes set which really expects
// all added icons to be the same size, otherwise weirdness ensues :)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.50.0/src/kiconloader.cpp new/kiconthemes-5.51.0/src/kiconloader.cpp
--- old/kiconthemes-5.50.0/src/kiconloader.cpp 2018-09-02 21:22:57.000000000 +0200
+++ new/kiconthemes-5.51.0/src/kiconloader.cpp 2018-10-08 10:15:39.000000000 +0200
@@ -521,22 +521,22 @@
QPoint startPoint;
switch (count) {
case 0:
- // bottom left corner
- startPoint = QPoint(margin, height - overlaySize - margin);
- break;
- case 1:
// bottom right corner
startPoint = QPoint(width - overlaySize - margin,
height - overlaySize - margin);
break;
- case 2:
- // top right corner
- startPoint = QPoint(width - overlaySize - margin, margin);
+ case 1:
+ // bottom left corner
+ startPoint = QPoint(margin, height - overlaySize - margin);
break;
- case 3:
+ case 2:
// top left corner
startPoint = QPoint(margin, margin);
break;
+ case 3:
+ // top right corner
+ startPoint = QPoint(width - overlaySize - margin, margin);
+ break;
}
startPoint /= pix.devicePixelRatio();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.50.0/src/tools/kiconfinder/kiconfinder.cpp new/kiconthemes-5.51.0/src/tools/kiconfinder/kiconfinder.cpp
--- old/kiconthemes-5.50.0/src/tools/kiconfinder/kiconfinder.cpp 2018-09-02 21:22:57.000000000 +0200
+++ new/kiconthemes-5.51.0/src/tools/kiconfinder/kiconfinder.cpp 2018-10-08 10:15:39.000000000 +0200
@@ -29,7 +29,7 @@
{
QGuiApplication app(argc, argv);
app.setApplicationName(QStringLiteral("kiconfinder"));
- app.setApplicationVersion(KICONTHEMES_VERSION_STRING);
+ app.setApplicationVersion(QLatin1String(KICONTHEMES_VERSION_STRING));
QCommandLineParser parser;
parser.setApplicationDescription(app.translate("main", "Finds an icon based on its name"));
parser.addPositionalArgument(QStringLiteral("iconname"), app.translate("main", "The icon name to look for"));