Hello community,
here is the log from the commit of package kdesignerplugin for openSUSE:Factory
checked in at 2019-03-21 09:44:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdesignerplugin (Old)
and /work/SRC/openSUSE:Factory/.kdesignerplugin.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdesignerplugin"
Thu Mar 21 09:44:53 2019 rev:65 rq:686732 version:5.56.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdesignerplugin/kdesignerplugin.changes
2019-02-28 21:29:12.585816590 +0100
+++
/work/SRC/openSUSE:Factory/.kdesignerplugin.new.28833/kdesignerplugin.changes
2019-03-21 09:44:53.366917043 +0100
@@ -1,0 +2,10 @@
+Sun Mar 10 20:15:35 UTC 2019 - [email protected]
+
+- Update to 5.56.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.56.0.php
+- Changes since 5.55.0:
+ * Make it compile with QT_NO_CAST_FROM_ASCII
+
+-------------------------------------------------------------------
Old:
----
kdesignerplugin-5.55.0.tar.xz
New:
----
kdesignerplugin-5.56.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdesignerplugin.spec ++++++
--- /var/tmp/diff_new_pack.yX4k8l/_old 2019-03-21 09:44:53.938916911 +0100
+++ /var/tmp/diff_new_pack.yX4k8l/_new 2019-03-21 09:44:53.938916911 +0100
@@ -16,14 +16,14 @@
#
-%define _tar_path 5.55
+%define _tar_path 5.56
# 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: kdesignerplugin
-Version: 5.55.0
+Version: 5.56.0
Release: 0
Summary: Framework for integration of KDE frameworks widgets with Qt
Designer
License: LGPL-2.1-or-later
++++++ kdesignerplugin-5.55.0.tar.xz -> kdesignerplugin-5.56.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdesignerplugin-5.55.0/CMakeLists.txt
new/kdesignerplugin-5.56.0/CMakeLists.txt
--- old/kdesignerplugin-5.55.0/CMakeLists.txt 2019-02-03 00:56:11.000000000
+0100
+++ new/kdesignerplugin-5.56.0/CMakeLists.txt 2019-03-02 14:38:15.000000000
+0100
@@ -1,11 +1,11 @@
cmake_minimum_required(VERSION 3.5)
-set(KF5_VERSION "5.55.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.55.0") # handled by release scripts
+set(KF5_VERSION "5.56.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.56.0") # handled by release scripts
project(KDesignerPlugin VERSION ${KF5_VERSION})
include(FeatureSummary)
-find_package(ECM 5.55.0 NO_MODULE)
+find_package(ECM 5.56.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)
@@ -85,8 +85,6 @@
set(BUILD_KDEWEBKIT_DESIGNER_PLUGIN TRUE)
endif()
-remove_definitions(-DQT_NO_CAST_FROM_ASCII)
-
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5DesignerPlugin")
if (KF5DocTools_FOUND)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdesignerplugin-5.55.0/po/da/kdesignerplugin5_qt.po
new/kdesignerplugin-5.56.0/po/da/kdesignerplugin5_qt.po
--- old/kdesignerplugin-5.55.0/po/da/kdesignerplugin5_qt.po 2019-02-03
00:56:11.000000000 +0100
+++ new/kdesignerplugin-5.56.0/po/da/kdesignerplugin5_qt.po 2019-03-02
14:38:15.000000000 +0100
@@ -2,8 +2,6 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
#
-# Martin Schlander, 2008.
-# Martin Schlander <[email protected]>, 2008.
# Martin Schlander <[email protected]>, 2008, 2009, 2010, 2011, 2012,
2013, 2014.
# Keld Simonsen <[email protected]>, 2010.
msgid ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdesignerplugin-5.55.0/po/id/kdesignerplugin5_qt.po
new/kdesignerplugin-5.56.0/po/id/kdesignerplugin5_qt.po
--- old/kdesignerplugin-5.55.0/po/id/kdesignerplugin5_qt.po 2019-02-03
00:56:11.000000000 +0100
+++ new/kdesignerplugin-5.56.0/po/id/kdesignerplugin5_qt.po 2019-03-02
14:38:15.000000000 +0100
@@ -16,7 +16,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Lokalize 18.12.0\n"
"X-Qt-Contexts: true\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdesignerplugin-5.55.0/po/zh_CN/kdesignerplugin5_qt.po
new/kdesignerplugin-5.56.0/po/zh_CN/kdesignerplugin5_qt.po
--- old/kdesignerplugin-5.55.0/po/zh_CN/kdesignerplugin5_qt.po 2019-02-03
00:56:11.000000000 +0100
+++ new/kdesignerplugin-5.56.0/po/zh_CN/kdesignerplugin5_qt.po 2019-03-02
14:38:15.000000000 +0100
@@ -13,7 +13,7 @@
msgid ""
msgstr ""
"Project-Id-Version: kdeorg\n"
-"PO-Revision-Date: 2019-01-27 22:57\n"
+"PO-Revision-Date: 2019-02-20 23:16\n"
"Last-Translator: guoyunhe <[email protected]>\n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdesignerplugin-5.55.0/src/kde.widgets
new/kdesignerplugin-5.56.0/src/kde.widgets
--- old/kdesignerplugin-5.55.0/src/kde.widgets 2019-02-03 00:56:11.000000000
+0100
+++ new/kdesignerplugin-5.56.0/src/kde.widgets 2019-03-02 14:38:15.000000000
+0100
@@ -270,7 +270,7 @@
[KSqueezedTextLabel]
ToolTip=A QLabel that squeezes its text (KF5)
WhatsThis=If the text is too long to fit into the label it is divided into
remaining left and right parts which are separated by three dots
-ConstructorArgs=("KSqueezedTextLabel", parent)
+ConstructorArgs=(QStringLiteral("KSqueezedTextLabel"), parent)
Group=Display (KF5)
# KTextWidgets
@@ -311,7 +311,7 @@
# KWidgetsAddons
[KUrlLabel]
ToolTip=URL Label (KF5)
-ConstructorArgs=("KUrlLabel", QString(), parent)
+ConstructorArgs=(QStringLiteral("KUrlLabel"), QString(), parent)
Group=Display (KF5)
# KIOWidgets
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdesignerplugin-5.55.0/src/kgendesignerplugin.cpp
new/kdesignerplugin-5.56.0/src/kgendesignerplugin.cpp
--- old/kdesignerplugin-5.55.0/src/kgendesignerplugin.cpp 2019-02-03
00:56:11.000000000 +0100
+++ new/kdesignerplugin-5.56.0/src/kgendesignerplugin.cpp 2019-03-02
14:38:15.000000000 +0100
@@ -86,28 +86,28 @@
QCoreApplication app(argc, argv);
QString description = QCoreApplication::translate("main", "Builds Qt
widget plugins from an ini style description file.");
- const char version[] = "0.5";
+ const QString version = QStringLiteral("0.5");
app.setApplicationVersion(version);
QCommandLineParser parser;
parser.addVersionOption();
parser.addHelpOption();
- parser.addPositionalArgument("file", QCoreApplication::translate("main",
"Input file."));
- parser.addOption(QCommandLineOption(QStringList() << "o",
QCoreApplication::translate("main", "Output file."), "file"));
- parser.addOption(QCommandLineOption(QStringList() << "n",
QCoreApplication::translate("main", "Name of the plugin class to generate
(deprecated, use PluginName in the input file)."), "name", "WidgetsPlugin"));
- parser.addOption(QCommandLineOption(QStringList() << "g",
QCoreApplication::translate("main", "Default widget group name to display in
designer (deprecated, use DefaultGroup in the input file)."), "group",
"Custom"));
+ parser.addPositionalArgument(QStringLiteral("file"),
QCoreApplication::translate("main", "Input file."));
+ parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("o"),
QCoreApplication::translate("main", "Output file."), QStringLiteral("file")));
+ parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("n"),
QCoreApplication::translate("main", "Name of the plugin class to generate
(deprecated, use PluginName in the input file)."), QStringLiteral("name"),
QStringLiteral("WidgetsPlugin")));
+ parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("g"),
QCoreApplication::translate("main", "Default widget group name to display in
designer (deprecated, use DefaultGroup in the input file)."),
QStringLiteral("group"), QStringLiteral("Custom")));
- KAboutData about("kgendesignerplugin",
+ KAboutData about(QStringLiteral("kgendesignerplugin"),
QCoreApplication::translate("kgendesignerplugin about data",
"kgendesignerplugin"),
version,
description,
KAboutLicense::GPL,
QCoreApplication::translate("kgendesignerplugin about data", "(C)
2004-2005 Ian Reinhart Geiser"),
QString(),
- nullptr,
- "[email protected]");
- about.addAuthor(QCoreApplication::translate("kgendesignerplugin about
data", "Ian Reinhart Geiser"), QString(), "[email protected]");
- about.addAuthor(QCoreApplication::translate("kgendesignerplugin about
data", "Daniel Molkentin"), QString(), "[email protected]");
+ QString(),
+ QStringLiteral("[email protected]"));
+ about.addAuthor(QCoreApplication::translate("kgendesignerplugin about
data", "Ian Reinhart Geiser"), QString(), QStringLiteral("[email protected]"));
+ about.addAuthor(QCoreApplication::translate("kgendesignerplugin about
data", "Daniel Molkentin"), QString(), QStringLiteral("[email protected]"));
about.setupCommandLine(&parser);
parser.process(app);
@@ -119,19 +119,19 @@
QFileInfo fi(parser.positionalArguments().at(0));
- QString outputFile = parser.value("o");
- QString pluginName = parser.value("n");
- QString group = parser.value("g");
+ QString outputFile = parser.value(QStringLiteral("o"));
+ QString pluginName = parser.value(QStringLiteral("n"));
+ QString group = parser.value(QStringLiteral("g"));
QString fileName = fi.absoluteFilePath();
- if (parser.isSet("o")) {
+ if (parser.isSet(QStringLiteral("o"))) {
QFile output(outputFile);
if (output.open(QIODevice::WriteOnly)) {
QTextStream ts(&output);
buildFile(ts, group, fileName, pluginName);
QString mocFile = output.fileName();
- mocFile.replace(".cpp", ".moc");
- ts << QString("#include <%1>\n").arg(mocFile) << endl;
+ mocFile.replace(QStringLiteral(".cpp"), QStringLiteral(".moc"));
+ ts << QStringLiteral("#include <%1>\n").arg(mocFile) << endl;
}
output.close();
} else {
@@ -149,7 +149,7 @@
QString defaultGroup = cg.readEntry("DefaultGroup", group);
QStringList includes = cg.readEntry("Includes", QStringList());
QStringList classes = input.groupList();
- classes.removeAll("Global");
+ classes.removeAll(QStringLiteral("Global"));
foreach (const QString &myInclude, classes) {
includes += buildWidgetInclude(myInclude, input);
@@ -173,7 +173,7 @@
QString denamespace(const QString &str)
{
QString denamespaced = str;
- denamespaced.remove("::");
+ denamespaced.remove(QStringLiteral("::"));
return denamespaced;
}
@@ -183,17 +183,17 @@
QHash<QString, QString> defMap;
const QString collName = input.readEntry("PluginName", pluginName);
Q_ASSERT(!collName.isEmpty());
- defMap.insert("CollName", collName);
+ defMap.insert(QStringLiteral("CollName"), collName);
QString genCode;
foreach (const QString &myClass, classes) {
- genCode += QString(" m_plugins.append( new %1(this)
);\n").arg(denamespace(myClass) + "Plugin");
+ genCode += QStringLiteral(" m_plugins.append( new
%1(this) );\n").arg(denamespace(myClass) + QStringLiteral("Plugin"));
}
- defMap.insert("CollectionAdd", genCode);
+ defMap.insert(QStringLiteral("CollectionAdd"), genCode);
- QString str = KMacroExpander::expandMacros(collClassDef, defMap);
- str += KMacroExpander::expandMacros(collClassImpl, defMap);
+ QString str = KMacroExpander::expandMacros(QLatin1String(collClassDef),
defMap);
+ str += KMacroExpander::expandMacros(QLatin1String(collClassImpl), defMap);
return str;
}
@@ -202,14 +202,14 @@
KConfigGroup input(&_input, name);
QHash<QString, QString> defMap;
- defMap.insert("Group", input.readEntry("Group", group).replace('\"',
"\\\""));
- defMap.insert("IncludeFile", input.readEntry("IncludeFile",
QString(name.toLower() + ".h")).remove(':'));
- defMap.insert("ToolTip", input.readEntry("ToolTip", QString(name + "
Widget")).replace('\"', "\\\""));
- defMap.insert("WhatsThis", input.readEntry("WhatsThis", QString(name + "
Widget")).replace('\"', "\\\""));
- defMap.insert("IsContainer", input.readEntry("IsContainer", "false"));
- defMap.insert("IconName", input.readEntry("IconName",
QString::fromLatin1(":/pics/%1.png").arg(denamespace(name).toLower())));
- defMap.insert("Class", name);
- defMap.insert("PluginName", denamespace(name) + QLatin1String("Plugin"));
+ defMap.insert(QStringLiteral("Group"), input.readEntry("Group",
group).replace(QLatin1Char('\"'), QStringLiteral("\\\"")));
+ defMap.insert(QStringLiteral("IncludeFile"),
input.readEntry("IncludeFile", QString(name.toLower() +
QStringLiteral(".h"))).remove(QLatin1Char(':')));
+ defMap.insert(QStringLiteral("ToolTip"), input.readEntry("ToolTip",
QString(name + QStringLiteral(" Widget"))).replace(QLatin1Char('\"'),
QStringLiteral("\\\"")));
+ defMap.insert(QStringLiteral("WhatsThis"), input.readEntry("WhatsThis",
QString(name + QStringLiteral(" Widget"))).replace(QLatin1Char('\"'),
QStringLiteral("\\\"")));
+ defMap.insert(QStringLiteral("IsContainer"),
input.readEntry("IsContainer", QStringLiteral("false")));
+ defMap.insert(QStringLiteral("IconName"), input.readEntry("IconName",
QString::fromLatin1(":/pics/%1.png").arg(denamespace(name).toLower())));
+ defMap.insert(QStringLiteral("Class"), name);
+ defMap.insert(QStringLiteral("PluginName"), denamespace(name) +
QLatin1String("Plugin"));
// FIXME: ### make this more useful, i.e. outsource to separate file
QString domXml = input.readEntry("DomXML", QString());
@@ -217,21 +217,21 @@
if (domXml.isEmpty()) {
domXml = QStringLiteral("QDesignerCustomWidgetInterface::domXml()");
} else {
- domXml =
QStringLiteral("QStringLiteral(\"%1\")").arg(domXml.replace('\"', "\\\""));
+ domXml =
QStringLiteral("QStringLiteral(\"%1\")").arg(domXml.replace(QLatin1Char('\"'),
QStringLiteral("\\\"")));
}
- defMap.insert("DomXml", domXml);
- defMap.insert("CodeTemplate", input.readEntry("CodeTemplate"));
- defMap.insert("CreateWidget", input.readEntry("CreateWidget",
- QString("\n return new %1%2;")
+ defMap.insert(QStringLiteral("DomXml"), domXml);
+ defMap.insert(QStringLiteral("CodeTemplate"),
input.readEntry("CodeTemplate"));
+ defMap.insert(QStringLiteral("CreateWidget"),
input.readEntry("CreateWidget",
+ QStringLiteral("\n return new %1%2;")
.arg(input.readEntry("ImplClass", name))
.arg(input.readEntry("ConstructorArgs", "( parent )"))));
- defMap.insert("Initialize", input.readEntry("Initialize", "\n
Q_UNUSED(core);\n if (mInitialized) return;\n
mInitialized=true;"));
+ defMap.insert(QStringLiteral("Initialize"), input.readEntry("Initialize",
"\n Q_UNUSED(core);\n if (mInitialized) return;\n
mInitialized=true;"));
- return KMacroExpander::expandMacros(classDef, defMap);
+ return KMacroExpander::expandMacros(QLatin1String(classDef), defMap);
}
QString buildWidgetInclude(const QString &name, KConfig &_input)
{
KConfigGroup input(&_input, name);
- return input.readEntry("IncludeFile", QString(name.toLower() + ".h"));
+ return input.readEntry("IncludeFile", QString(name.toLower() +
QStringLiteral(".h")));
}
