Hello community, here is the log from the commit of package kconfig for openSUSE:Factory checked in at 2018-04-19 15:14:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kconfig (Old) and /work/SRC/openSUSE:Factory/.kconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kconfig" Thu Apr 19 15:14:58 2018 rev:54 rq:596855 version:5.45.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kconfig/kconfig.changes 2018-03-20 21:45:00.370851874 +0100 +++ /work/SRC/openSUSE:Factory/.kconfig.new/kconfig.changes 2018-04-19 15:15:45.736282832 +0200 @@ -1,0 +2,14 @@ +Sat Apr 14 13:19:02 CEST 2018 - [email protected] + +- Update to 5.45.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.45.0.php +- Changes since 5.44.0: + * Fix autotest + * Remove useless QT_VERSION_CHECK + * Remove not necessary QtCore and co +- Refreshed patches: + * kconfig-desktop-translations.patch + +------------------------------------------------------------------- Old: ---- kconfig-5.44.0.tar.xz New: ---- kconfig-5.45.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kconfig.spec ++++++ --- /var/tmp/diff_new_pack.eybun4/_old 2018-04-19 15:15:46.504252341 +0200 +++ /var/tmp/diff_new_pack.eybun4/_new 2018-04-19 15:15:46.508252183 +0200 @@ -18,13 +18,13 @@ %bcond_without lang %define sonum 5 -%define _tar_path 5.44 +%define _tar_path 5.45 # 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: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kconfig -Version: 5.44.0 +Version: 5.45.0 Release: 0 BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} ++++++ kconfig-5.44.0.tar.xz -> kconfig-5.45.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/CMakeLists.txt new/kconfig-5.45.0/CMakeLists.txt --- old/kconfig-5.44.0/CMakeLists.txt 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/CMakeLists.txt 2018-04-07 21:33:28.000000000 +0200 @@ -1,16 +1,16 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.44.0") # handled by release scripts +set(KF5_VERSION "5.45.0") # handled by release scripts project(KConfig VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.44.0 NO_MODULE) +find_package(ECM 5.45.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) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) -set(REQUIRED_QT_VERSION 5.7.0) +set(REQUIRED_QT_VERSION 5.8.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Xml) option(KCONFIG_USE_GUI "Build components using Qt5Gui" ON) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/autotests/kconfig_compiler/kconfigcompiler_test.cpp new/kconfig-5.45.0/autotests/kconfig_compiler/kconfigcompiler_test.cpp --- old/kconfig-5.44.0/autotests/kconfig_compiler/kconfigcompiler_test.cpp 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/autotests/kconfig_compiler/kconfigcompiler_test.cpp 2018-04-07 21:33:28.000000000 +0200 @@ -14,11 +14,11 @@ ************************************************************************* */ -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QProcess> -#include <QtCore/QString> -#include <QtTest/QtTest> +#include <QDir> +#include <QFile> +#include <QProcess> +#include <QString> +#include <QtTest> #include <qstandardpaths.h> #include "kconfigcompiler_test.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/autotests/kconfig_compiler/kconfigcompiler_test.h new/kconfig-5.45.0/autotests/kconfig_compiler/kconfigcompiler_test.h --- old/kconfig-5.44.0/autotests/kconfig_compiler/kconfigcompiler_test.h 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/autotests/kconfig_compiler/kconfigcompiler_test.h 2018-04-07 21:33:28.000000000 +0200 @@ -17,8 +17,8 @@ #ifndef KCONFIGCOMPILER_TEST_H #define KCONFIGCOMPILER_TEST_H -#include <QtCore/QFile> -#include <QtCore/QObject> +#include <QFile> +#include <QObject> class QString; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/autotests/kconfig_compiler/kconfigcompiler_test_signals.cpp new/kconfig-5.45.0/autotests/kconfig_compiler/kconfigcompiler_test_signals.cpp --- old/kconfig-5.44.0/autotests/kconfig_compiler/kconfigcompiler_test_signals.cpp 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/autotests/kconfig_compiler/kconfigcompiler_test_signals.cpp 2018-04-07 21:33:28.000000000 +0200 @@ -23,11 +23,11 @@ #include "signals_test_no_singleton.h" #include "signals_test_singleton_dpointer.h" #include "signals_test_no_singleton_dpointer.h" -#include <QtTest/QtTestGui> -#include <QtTest/QSignalSpy> -#include <QtCore/QSharedPointer> -#include <QtCore/QtGlobal> -#include <QtCore/QDebug> +#include <QtTestGui> +#include <QSignalSpy> +#include <QSharedPointer> +#include <QtGlobal> +#include <QDebug> #include <QTemporaryFile> #include <QFileInfo> #include <functional> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/autotests/kconfig_compiler/test10.cpp.ref new/kconfig-5.45.0/autotests/kconfig_compiler/test10.cpp.ref --- old/kconfig-5.44.0/autotests/kconfig_compiler/test10.cpp.ref 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/autotests/kconfig_compiler/test10.cpp.ref 2018-04-07 21:33:28.000000000 +0200 @@ -4,7 +4,7 @@ #include "test10.h" #include <qglobal.h> -#include <QtCore/QFile> +#include <QFile> class Test10Helper { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/autotests/kconfig_compiler/test4.cpp.ref new/kconfig-5.45.0/autotests/kconfig_compiler/test4.cpp.ref --- old/kconfig-5.44.0/autotests/kconfig_compiler/test4.cpp.ref 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/autotests/kconfig_compiler/test4.cpp.ref 2018-04-07 21:33:28.000000000 +0200 @@ -4,7 +4,7 @@ #include "test4.h" #include <qglobal.h> -#include <QtCore/QFile> +#include <QFile> class Test4Helper { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/autotests/kconfig_compiler/test5.cpp.ref new/kconfig-5.45.0/autotests/kconfig_compiler/test5.cpp.ref --- old/kconfig-5.44.0/autotests/kconfig_compiler/test5.cpp.ref 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/autotests/kconfig_compiler/test5.cpp.ref 2018-04-07 21:33:28.000000000 +0200 @@ -4,7 +4,7 @@ #include "test5.h" #include <qglobal.h> -#include <QtCore/QFile> +#include <QFile> class Test5Helper { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/autotests/kconfig_compiler/test8b.cpp.ref new/kconfig-5.45.0/autotests/kconfig_compiler/test8b.cpp.ref --- old/kconfig-5.44.0/autotests/kconfig_compiler/test8b.cpp.ref 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/autotests/kconfig_compiler/test8b.cpp.ref 2018-04-07 21:33:28.000000000 +0200 @@ -4,7 +4,7 @@ #include "test8b.h" #include <qglobal.h> -#include <QtCore/QFile> +#include <QFile> class Test8bHelper { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/autotests/kconfig_compiler/test8c.cpp.ref new/kconfig-5.45.0/autotests/kconfig_compiler/test8c.cpp.ref --- old/kconfig-5.44.0/autotests/kconfig_compiler/test8c.cpp.ref 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/autotests/kconfig_compiler/test8c.cpp.ref 2018-04-07 21:33:28.000000000 +0200 @@ -4,7 +4,7 @@ #include "test8c.h" #include <qglobal.h> -#include <QtCore/QFile> +#include <QFile> #include <QDebug> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/autotests/kconfig_compiler/test9main.cpp new/kconfig-5.45.0/autotests/kconfig_compiler/test9main.cpp --- old/kconfig-5.44.0/autotests/kconfig_compiler/test9main.cpp 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/autotests/kconfig_compiler/test9main.cpp 2018-04-07 21:33:28.000000000 +0200 @@ -19,7 +19,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "test9.h" -#include <QtCore/QDir> +#include <QDir> #include <QGuiApplication> #include <QDebug> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/autotests/kconfig_compiler/test_dpointer.cpp.ref new/kconfig-5.45.0/autotests/kconfig_compiler/test_dpointer.cpp.ref --- old/kconfig-5.44.0/autotests/kconfig_compiler/test_dpointer.cpp.ref 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/autotests/kconfig_compiler/test_dpointer.cpp.ref 2018-04-07 21:33:28.000000000 +0200 @@ -4,7 +4,7 @@ #include "test_dpointer.h" #include <qglobal.h> -#include <QtCore/QFile> +#include <QFile> class TestDPointerPrivate { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/autotests/kconfig_compiler/test_signal.cpp.ref new/kconfig-5.45.0/autotests/kconfig_compiler/test_signal.cpp.ref --- old/kconfig-5.44.0/autotests/kconfig_compiler/test_signal.cpp.ref 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/autotests/kconfig_compiler/test_signal.cpp.ref 2018-04-07 21:33:28.000000000 +0200 @@ -4,7 +4,7 @@ #include "test_signal.h" #include <qglobal.h> -#include <QtCore/QFile> +#include <QFile> class TestSignalHelper { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/autotests/kconfigguitest.cpp new/kconfig-5.45.0/autotests/kconfigguitest.cpp --- old/kconfig-5.44.0/autotests/kconfigguitest.cpp 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/autotests/kconfigguitest.cpp 2018-04-07 21:33:28.000000000 +0200 @@ -17,7 +17,7 @@ Boston, MA 02110-1301, USA. */ -#include <QtTest/QtTestGui> +#include <QtTestGui> #include "kconfigguitest.h" #include <kconfig.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/autotests/kconfigguitest.h new/kconfig-5.45.0/autotests/kconfigguitest.h --- old/kconfig-5.44.0/autotests/kconfigguitest.h 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/autotests/kconfigguitest.h 2018-04-07 21:33:28.000000000 +0200 @@ -19,7 +19,7 @@ #ifndef KCONFIGTEST_H #define KCONFIGTEST_H -#include <QtCore/QObject> +#include <QObject> class KConfigTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/autotests/kconfigloadertest.h new/kconfig-5.45.0/autotests/kconfigloadertest.h --- old/kconfig-5.44.0/autotests/kconfigloadertest.h 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/autotests/kconfigloadertest.h 2018-04-07 21:33:28.000000000 +0200 @@ -20,7 +20,7 @@ #ifndef KCONFIGLOADERTEST_H #define KCONFIGLOADERTEST_H -#include <QtTest/QtTest> +#include <QtTest> class KConfigLoader; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/autotests/kconfignokdehometest.cpp new/kconfig-5.45.0/autotests/kconfignokdehometest.cpp --- old/kconfig-5.44.0/autotests/kconfignokdehometest.cpp 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/autotests/kconfignokdehometest.cpp 2018-04-07 21:33:28.000000000 +0200 @@ -19,7 +19,7 @@ #include <QObject> -#include <QtTest/QtTest> +#include <QtTest> #include <QStandardPaths> #include <ksharedconfig.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/autotests/kconfigskeletontest.cpp new/kconfig-5.45.0/autotests/kconfigskeletontest.cpp --- old/kconfig-5.44.0/autotests/kconfigskeletontest.cpp 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/autotests/kconfigskeletontest.cpp 2018-04-07 21:33:28.000000000 +0200 @@ -21,7 +21,7 @@ #include <kconfig.h> #include <QFont> -#include <QtTest/QtTestGui> +#include <QtTestGui> QTEST_MAIN(KConfigSkeletonTest) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/autotests/kconfigtest.cpp new/kconfig-5.45.0/autotests/kconfigtest.cpp --- old/kconfig-5.44.0/autotests/kconfigtest.cpp 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/autotests/kconfigtest.cpp 2018-04-07 21:33:28.000000000 +0200 @@ -23,7 +23,7 @@ #include "kconfigtest.h" #include "helper.h" -#include <QtTest/QtTest> +#include <QtTest> #include <qtemporarydir.h> #include <QStandardPaths> #include <kdesktopfile.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/autotests/kconfigtest.h new/kconfig-5.45.0/autotests/kconfigtest.h --- old/kconfig-5.44.0/autotests/kconfigtest.h 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/autotests/kconfigtest.h 2018-04-07 21:33:28.000000000 +0200 @@ -19,7 +19,7 @@ #ifndef KCONFIGTEST_H #define KCONFIGTEST_H -#include <QtCore/QObject> +#include <QObject> class KConfigTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/autotests/kdesktopfiletest.h new/kconfig-5.45.0/autotests/kdesktopfiletest.h --- old/kconfig-5.44.0/autotests/kdesktopfiletest.h 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/autotests/kdesktopfiletest.h 2018-04-07 21:33:28.000000000 +0200 @@ -19,7 +19,7 @@ #ifndef KDESKTOPFILETEST_H #define KDESKTOPFILETEST_H -#include <QtCore/QObject> +#include <QObject> class KDesktopFileTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/autotests/kentrymaptest.h new/kconfig-5.45.0/autotests/kentrymaptest.h --- old/kconfig-5.44.0/autotests/kentrymaptest.h 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/autotests/kentrymaptest.h 2018-04-07 21:33:28.000000000 +0200 @@ -20,7 +20,7 @@ #ifndef KENTRYMAPTEST_H #define KENTRYMAPTEST_H -#include <QtCore/QObject> +#include <QObject> #include "kconfigdata.h" class KEntryMapTest : public QObject diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/autotests/ksharedconfig_in_global_object.cpp new/kconfig-5.45.0/autotests/ksharedconfig_in_global_object.cpp --- old/kconfig-5.44.0/autotests/ksharedconfig_in_global_object.cpp 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/autotests/ksharedconfig_in_global_object.cpp 2018-04-07 21:33:28.000000000 +0200 @@ -17,8 +17,8 @@ */ -#include <QtCore/QCoreApplication> -#include <QtCore/QtGlobal> +#include <QCoreApplication> +#include <QtGlobal> #include <QTimer> #include <ksharedconfig.h> #include <kconfiggroup.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/autotests/kstandardshortcuttest.cpp new/kconfig-5.45.0/autotests/kstandardshortcuttest.cpp --- old/kconfig-5.44.0/autotests/kstandardshortcuttest.cpp 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/autotests/kstandardshortcuttest.cpp 2018-04-07 21:33:28.000000000 +0200 @@ -17,7 +17,7 @@ Boston, MA 02110-1301, USA. */ -#include <QtTest/QtTest> +#include <QtTest> #include "kstandardshortcuttest.h" QTEST_MAIN(KStandardShortcutTest) // GUI needed by KAccel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/autotests/kstandardshortcuttest.h new/kconfig-5.45.0/autotests/kstandardshortcuttest.h --- old/kconfig-5.44.0/autotests/kstandardshortcuttest.h 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/autotests/kstandardshortcuttest.h 2018-04-07 21:33:28.000000000 +0200 @@ -20,7 +20,7 @@ #ifndef KSTDACCELTEST_H #define KSTDACCELTEST_H -#include <QtCore/QObject> +#include <QObject> class KStandardShortcutTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/autotests/test_kconf_update.cpp new/kconfig-5.45.0/autotests/test_kconf_update.cpp --- old/kconfig-5.44.0/autotests/test_kconf_update.cpp 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/autotests/test_kconf_update.cpp 2018-04-07 21:33:28.000000000 +0200 @@ -24,7 +24,7 @@ #include <QFile> #include <QDir> #include <QSharedPointer> -#include <QtCore/QProcess> +#include <QProcess> #include <qtemporaryfile.h> #include <qstandardpaths.h> #include "config-kconf.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/po/ca@valencia/kconfig5_qt.po new/kconfig-5.45.0/po/ca@valencia/kconfig5_qt.po --- old/kconfig-5.44.0/po/ca@valencia/kconfig5_qt.po 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/po/ca@valencia/kconfig5_qt.po 2018-04-07 21:33:28.000000000 +0200 @@ -123,17 +123,17 @@ #: gui/kstandardshortcut.cpp:93 msgctxt "KStandardShortcut|@action" msgid "Find" -msgstr "Busca" +msgstr "Cerca" #: gui/kstandardshortcut.cpp:94 msgctxt "KStandardShortcut|@action" msgid "Find Next" -msgstr "Busca el següent" +msgstr "Cerca el següent" #: gui/kstandardshortcut.cpp:95 msgctxt "KStandardShortcut|@action" msgid "Find Prev" -msgstr "Busca l'anterior" +msgstr "Cerca l'anterior" #: gui/kstandardshortcut.cpp:96 msgctxt "KStandardShortcut|@action" @@ -502,12 +502,12 @@ #: kreadconfig/kreadconfig.cpp:57 kreadconfig/kwriteconfig.cpp:36 msgctxt "main|" msgid "Group to look in. Use repeatedly for nested groups." -msgstr "Grup on buscar. S'usa repetidament per a grups imbricats." +msgstr "Grup on cercar. S'usa repetidament per a grups imbricats." #: kreadconfig/kreadconfig.cpp:58 kreadconfig/kwriteconfig.cpp:37 msgctxt "main|" msgid "Key to look for" -msgstr "Clau a buscar" +msgstr "Clau a cercar" #: kreadconfig/kreadconfig.cpp:59 msgctxt "main|" @@ -532,5 +532,5 @@ msgctxt "main|" msgid "The value to write. Mandatory, on a shell use '' for empty" msgstr "" -"El valor a escriure. Obligatori, a l'intèrpret d'ordes fer servir '' si està " -"buit" +"El valor a escriure. Obligatori, a l'intèrpret d'ordres fer servir '' si " +"està buit" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/po/cs/kconfig5_qt.po new/kconfig-5.45.0/po/cs/kconfig5_qt.po --- old/kconfig-5.44.0/po/cs/kconfig5_qt.po 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/po/cs/kconfig5_qt.po 2018-04-07 21:33:28.000000000 +0200 @@ -385,12 +385,9 @@ msgstr "Klávesové zkratky" #: gui/kstandardshortcut.cpp:159 -#, fuzzy -#| msgctxt "KStandardShortcut|@action" -#| msgid "Configure Notifications" msgctxt "KStandardShortcut|@action" msgid "Configure Application" -msgstr "Nastavit oznamování" +msgstr "" #: gui/kstandardshortcut.cpp:160 msgctxt "KStandardShortcut|@action" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/po/id/kconfig5_qt.po new/kconfig-5.45.0/po/id/kconfig5_qt.po --- old/kconfig-5.44.0/po/id/kconfig5_qt.po 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/po/id/kconfig5_qt.po 2018-04-07 21:33:28.000000000 +0200 @@ -10,7 +10,7 @@ "Project-Id-Version: kwriteconfig\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-11 02:17+0000\n" -"PO-Revision-Date: 2018-03-03 08:12+0700\n" +"PO-Revision-Date: 2018-04-03 21:35+0700\n" "Last-Translator: Wantoyo <[email protected]>\n" "Language-Team: Indonesian <[email protected]>\n" "Language: id\n" @@ -30,7 +30,7 @@ #, qt-format msgctxt "KConfigIniBackend|" msgid "Configuration file \"%1\" not writable.\n" -msgstr "Fail konfigurasi \"%1\" tak dapat ditulis.\n" +msgstr "File konfigurasi \"%1\" tak dapat ditulis.\n" #: core/kemailsettings.cpp:256 core/kemailsettings.cpp:259 #: core/kemailsettings.cpp:267 @@ -71,12 +71,12 @@ #: gui/kstandardshortcut.cpp:81 msgctxt "KStandardShortcut|@action" msgid "Undo" -msgstr "Bolak" +msgstr "Takjadi" #: gui/kstandardshortcut.cpp:82 msgctxt "KStandardShortcut|@action" msgid "Redo" -msgstr "Balik" +msgstr "Jadilagi" #: gui/kstandardshortcut.cpp:83 msgctxt "KStandardShortcut|@action" @@ -361,7 +361,7 @@ #: gui/kstandardshortcut.cpp:153 msgctxt "KStandardShortcut|@action" msgid "Edit Bookmarks" -msgstr "Sunting Markah" +msgstr "Edit Markah" #: gui/kstandardshortcut.cpp:154 msgctxt "KStandardShortcut|@action" @@ -401,7 +401,7 @@ #: gui/kstandardshortcut.cpp:161 msgctxt "KStandardShortcut|@action" msgid "Configure Notifications" -msgstr "Konfigurasi Notifikasi" +msgstr "Konfigurasi Pemberitahuan" #: gui/kstandardshortcut.cpp:162 msgctxt "KStandardShortcut|@action" @@ -451,7 +451,7 @@ #: kconf_update/kconf_update.cpp:953 msgctxt "main|" msgid "KDE Tool for updating user configuration files" -msgstr "Alat KDE untuk memperbarui fail konfigurasi pengguna" +msgstr "Alat KDE untuk memperbarui file konfigurasi pengguna" #: kconf_update/kconf_update.cpp:955 msgctxt "main|" @@ -464,23 +464,23 @@ "For unit tests only: use test directories to stay away from the user's real " "files" msgstr "" -"Untuk uji unit saja: gunakan direktori uji agar menjauh dari fail asli " +"Untuk uji unit saja: gunakan direktori uji agar menjauh dari file asli " "pengguna" #: kconf_update/kconf_update.cpp:957 msgctxt "main|" msgid "Check whether config file itself requires updating" -msgstr "Cek apakah fail konfigurasi itu sendiri memerlukan pemutakhiran" +msgstr "Cek apakah file konfigurasi itu sendiri memerlukan peningkatan" #: kconf_update/kconf_update.cpp:958 msgctxt "main|" msgid "File(s) to read update instructions from" -msgstr "Fail untuk membaca instruksi pembaruan dari" +msgstr "File untuk membaca instruksi pembaruan dari" #: kconfig_compiler/kconfig_compiler.cpp:1572 msgctxt "main|" msgid "Directory to generate files in [.]" -msgstr "Direktori untuk membuat fail di [.]" +msgstr "Direktori untuk membuat file di [.]" #: kconfig_compiler/kconfig_compiler.cpp:1573 msgctxt "main|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/po/zh_CN/kconfig5_qt.po new/kconfig-5.45.0/po/zh_CN/kconfig5_qt.po --- old/kconfig-5.44.0/po/zh_CN/kconfig5_qt.po 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/po/zh_CN/kconfig5_qt.po 2018-04-07 21:33:28.000000000 +0200 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2018-02-28 02:23-0500\n" +"PO-Revision-Date: 2018-04-05 09:22-0400\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/src/core/conversioncheck.h new/kconfig-5.45.0/src/core/conversioncheck.h --- old/kconfig-5.44.0/src/core/conversioncheck.h 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/src/core/conversioncheck.h 2018-04-07 21:33:28.000000000 +0200 @@ -21,12 +21,12 @@ #ifndef CONVERSION_CHECK_H #define CONVERSION_CHECK_H -#include <QtCore/QString> -#include <QtCore/QDate> -#include <QtCore/QPoint> -#include <QtCore/QSize> -#include <QtCore/QRect> -#include <QtCore/QVariant> +#include <QString> +#include <QDate> +#include <QPoint> +#include <QSize> +#include <QRect> +#include <QVariant> class QColor; class QFont; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/src/core/kauthorized.cpp new/kconfig-5.45.0/src/core/kauthorized.cpp --- old/kconfig-5.44.0/src/core/kauthorized.cpp 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/src/core/kauthorized.cpp 2018-04-07 21:33:28.000000000 +0200 @@ -20,8 +20,8 @@ #include "kauthorized.h" -#include <QtCore/QDir> -#include <QtCore/QRegExp> +#include <QDir> +#include <QRegExp> #include <QList> #include <QUrl> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/src/core/kconfig.cpp new/kconfig-5.45.0/src/core/kconfig.cpp --- old/kconfig-5.44.0/src/core/kconfig.cpp 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/src/core/kconfig.cpp 2018-04-07 21:33:28.000000000 +0200 @@ -49,10 +49,10 @@ #include <qfile.h> #include <qlocale.h> #include <qdir.h> -#include <QtCore/QProcess> -#include <QtCore/QSet> -#include <QtCore/QBasicMutex> -#include <QtCore/QMutexLocker> +#include <QProcess> +#include <QSet> +#include <QBasicMutex> +#include <QMutexLocker> bool KConfigPrivate::mappingsRegistered = false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/src/core/kconfig.h new/kconfig-5.45.0/src/core/kconfig.h --- old/kconfig-5.44.0/src/core/kconfig.h 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/src/core/kconfig.h 2018-04-07 21:33:28.000000000 +0200 @@ -28,10 +28,10 @@ #include <kconfigcore_export.h> -#include <QtCore/QString> -#include <QtCore/QVariant> -#include <QtCore/QByteArray> -#include <QtCore/QList> +#include <QString> +#include <QVariant> +#include <QByteArray> +#include <QList> #include <qstandardpaths.h> class KConfigGroup; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/src/core/kconfig_p.h new/kconfig-5.45.0/src/core/kconfig_p.h --- old/kconfig-5.44.0/src/core/kconfig_p.h 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/src/core/kconfig_p.h 2018-04-07 21:33:28.000000000 +0200 @@ -28,10 +28,10 @@ #include "kconfigbackend_p.h" #include "kconfiggroup.h" -#include <QtCore/QStringList> -#include <QtCore/QStack> -#include <QtCore/QFile> -#include <QtCore/QDir> +#include <QStringList> +#include <QStack> +#include <QFile> +#include <QDir> class KConfigPrivate { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/src/core/kconfigbackend.cpp new/kconfig-5.45.0/src/core/kconfigbackend.cpp --- old/kconfig-5.44.0/src/core/kconfigbackend.cpp 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/src/core/kconfigbackend.cpp 2018-04-07 21:33:28.000000000 +0200 @@ -22,12 +22,12 @@ #include "kconfigbackend_p.h" -#include <QtCore/QDateTime> -#include <QtCore/QStringList> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QHash> -#include <QtCore/QDebug> +#include <QDateTime> +#include <QStringList> +#include <QDir> +#include <QFileInfo> +#include <QHash> +#include <QDebug> #include "kconfig.h" #include "kconfigini_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/src/core/kconfigbackend.desktop new/kconfig-5.45.0/src/core/kconfigbackend.desktop --- old/kconfig-5.44.0/src/core/kconfigbackend.desktop 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/src/core/kconfigbackend.desktop 2018-04-07 21:33:28.000000000 +0200 @@ -39,7 +39,7 @@ Comment[ia]=Retro-administration de immagazinage (storage) pro Kconfig Comment[id]=Backend penyimpanan untuk KConfig Comment[is]=Geymslubakendi fyrir KConfig -Comment[it]=Backend di archiviazione per KConfig +Comment[it]=Motore di archiviazione per KConfig Comment[ja]=KConfig のストレージバックエンド Comment[kk]=KConfig үшін сақтау тетігі Comment[km]=កម្មវិធីខាងក្រោយការផ្ទុកសម្រាប់ KConfig diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/src/core/kconfigbackend_p.h new/kconfig-5.45.0/src/core/kconfigbackend_p.h --- old/kconfig-5.44.0/src/core/kconfigbackend_p.h 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/src/core/kconfigbackend_p.h 2018-04-07 21:33:28.000000000 +0200 @@ -23,8 +23,8 @@ #ifndef KCONFIGBACKEND_H #define KCONFIGBACKEND_H -#include <QtCore/QObject> -#include <QtCore/QString> +#include <QObject> +#include <QString> #include <QExplicitlySharedDataPointer> #include <kconfigcore_export.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/src/core/kconfigbase.cpp new/kconfig-5.45.0/src/core/kconfigbase.cpp --- old/kconfig-5.44.0/src/core/kconfigbase.cpp 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/src/core/kconfigbase.cpp 2018-04-07 21:33:28.000000000 +0200 @@ -24,7 +24,7 @@ #include "kconfiggroup.h" -#include <QtCore/QString> +#include <QString> bool KConfigBase::hasGroup(const QString &group) const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/src/core/kconfigbase.h new/kconfig-5.45.0/src/core/kconfigbase.h --- old/kconfig-5.44.0/src/core/kconfigbase.h 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/src/core/kconfigbase.h 2018-04-07 21:33:28.000000000 +0200 @@ -26,7 +26,7 @@ #include <kconfigcore_export.h> -#include <QtCore/QtGlobal> +#include <QtGlobal> class QStringList; class KConfigGroup; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/src/core/kconfigbase_p.h new/kconfig-5.45.0/src/core/kconfigbase_p.h --- old/kconfig-5.44.0/src/core/kconfigbase_p.h 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/src/core/kconfigbase_p.h 2018-04-07 21:33:28.000000000 +0200 @@ -22,7 +22,7 @@ #ifndef KCONFIGBASE_P_H #define KCONFIGBASE_P_H -#include <QtCore/QSharedData> +#include <QSharedData> class KConfigBasePrivate : public QSharedData { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/src/core/kconfigdata.h new/kconfig-5.45.0/src/core/kconfigdata.h --- old/kconfig-5.44.0/src/core/kconfigdata.h 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/src/core/kconfigdata.h 2018-04-07 21:33:28.000000000 +0200 @@ -23,10 +23,10 @@ #ifndef KCONFIGDATA_H #define KCONFIGDATA_H -#include <QtCore/QByteArray> -#include <QtCore/QString> -#include <QtCore/QMap> -#include <QtCore/QDebug> +#include <QByteArray> +#include <QString> +#include <QMap> +#include <QDebug> /** * map/dict/list config node entry. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/src/core/kconfiggroup.cpp new/kconfig-5.45.0/src/core/kconfiggroup.cpp --- old/kconfig-5.44.0/src/core/kconfiggroup.cpp 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/src/core/kconfiggroup.cpp 2018-04-07 21:33:28.000000000 +0200 @@ -28,15 +28,15 @@ #include "ksharedconfig.h" #include "kconfigdata.h" -#include <QtCore/QDate> -#include <QtCore/QSharedData> -#include <QtCore/QFile> -#include <QtCore/QPoint> -#include <QtCore/QRect> -#include <QtCore/QString> -#include <QtCore/QTextStream> -#include <QtCore/QDir> -#include <QtCore/QUrl> +#include <QDate> +#include <QSharedData> +#include <QFile> +#include <QPoint> +#include <QRect> +#include <QString> +#include <QTextStream> +#include <QDir> +#include <QUrl> #include <stdlib.h> @@ -388,7 +388,7 @@ } #ifdef Q_OS_WIN -# include <QtCore/QDir> +# include <QDir> #endif static bool cleanHomeDirPath(QString &path, const QString &homeDir) @@ -957,9 +957,7 @@ if (!value.canConvert(QMetaType::QStringList)) qWarning() << "not all types in \"" << key << "\" can convert to QString," " information will be lost"; -#if QT_VERSION >= QT_VERSION_CHECK(5,8,0) Q_FALLTHROUGH(); -#endif case QMetaType::QStringList: writeEntry(key, value.toList(), flags); return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/src/core/kconfiggroup.h new/kconfig-5.45.0/src/core/kconfiggroup.h --- old/kconfig-5.44.0/src/core/kconfiggroup.h 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/src/core/kconfiggroup.h 2018-04-07 21:33:28.000000000 +0200 @@ -28,9 +28,9 @@ #include <kconfigcore_export.h> -#include <QtCore/QExplicitlySharedDataPointer> -#include <QtCore/QVariant> -#include <QtCore/QStringList> +#include <QExplicitlySharedDataPointer> +#include <QVariant> +#include <QStringList> class KConfig; class KConfigGroupPrivate; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/src/core/kconfiggroup_p.h new/kconfig-5.45.0/src/core/kconfiggroup_p.h --- old/kconfig-5.44.0/src/core/kconfiggroup_p.h 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/src/core/kconfiggroup_p.h 2018-04-07 21:33:28.000000000 +0200 @@ -21,7 +21,7 @@ #ifndef KCONFIGGROUP_P_H #define KCONFIGGROUP_P_H -#include <QtCore/QVariant> +#include <QVariant> #include "kconfiggroup.h" class KConfigGroup; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/src/core/kcoreconfigskeleton.h new/kconfig-5.45.0/src/core/kcoreconfigskeleton.h --- old/kconfig-5.44.0/src/core/kcoreconfigskeleton.h 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/src/core/kcoreconfigskeleton.h 2018-04-07 21:33:28.000000000 +0200 @@ -28,12 +28,12 @@ #include <ksharedconfig.h> #include <kconfiggroup.h> -#include <QtCore/QDate> -#include <QtCore/QHash> -#include <QtCore/QRect> -#include <QtCore/QStringList> -#include <QtCore/QVariant> -#include <QtCore/QUrl> +#include <QDate> +#include <QHash> +#include <QRect> +#include <QStringList> +#include <QVariant> +#include <QUrl> class KCoreConfigSkeletonPrivate; class KConfigSkeletonItemPrivate; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/src/core/kdesktopfile.cpp new/kconfig-5.45.0/src/core/kdesktopfile.cpp --- old/kconfig-5.44.0/src/core/kdesktopfile.cpp 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/src/core/kdesktopfile.cpp 2018-04-07 21:33:28.000000000 +0200 @@ -25,8 +25,8 @@ #include <unistd.h> #endif -#include <QtCore/QDir> -#include <QtCore/QFileInfo> +#include <QDir> +#include <QFileInfo> #include <QUrl> #include <qstandardpaths.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/src/core/kemailsettings.h new/kconfig-5.45.0/src/core/kemailsettings.h --- old/kconfig-5.44.0/src/core/kemailsettings.h 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/src/core/kemailsettings.h 2018-04-07 21:33:28.000000000 +0200 @@ -28,8 +28,8 @@ #ifndef _KEMAILSETTINGS_H #define _KEMAILSETTINGS_H -#include <QtCore/QCoreApplication> // Q_DECLARE_TR_FUNCTIONS -#include <QtCore/QStringList> +#include <QCoreApplication> // Q_DECLARE_TR_FUNCTIONS +#include <QStringList> #include <kconfigcore_export.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/src/gui/kconfiggroupgui.cpp new/kconfig-5.45.0/src/gui/kconfiggroupgui.cpp --- old/kconfig-5.44.0/src/gui/kconfiggroupgui.cpp 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/src/gui/kconfiggroupgui.cpp 2018-04-07 21:33:28.000000000 +0200 @@ -20,7 +20,7 @@ #include <kconfiggroup.h> -#include <QtCore/QMutableStringListIterator> +#include <QMutableStringListIterator> #include <QColor> #include <QDebug> #include <QFont> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/src/gui/kstandardshortcut.h new/kconfig-5.45.0/src/gui/kstandardshortcut.h --- old/kconfig-5.44.0/src/gui/kstandardshortcut.h 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/src/gui/kstandardshortcut.h 2018-04-07 21:33:28.000000000 +0200 @@ -20,7 +20,7 @@ #ifndef KSTANDARDSHORTCUT_H #define KSTANDARDSHORTCUT_H -#include <QtCore/QString> +#include <QString> #include <QKeySequence> #include <kconfiggui_export.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/src/kconf_update/kconf_update.cpp new/kconfig-5.45.0/src/kconf_update/kconf_update.cpp --- old/kconfig-5.44.0/src/kconf_update/kconf_update.cpp 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/src/kconf_update/kconf_update.cpp 2018-04-07 21:33:28.000000000 +0200 @@ -20,14 +20,14 @@ #include <config-kconf.h> // CMAKE_INSTALL_PREFIX -#include <QtCore/QDate> -#include <QtCore/QFile> -#include <QtCore/QTextStream> -#include <QtCore/QTextCodec> +#include <QDate> +#include <QFile> +#include <QTextStream> +#include <QTextCodec> #include <QUrl> #include <QTemporaryFile> #include <QCoreApplication> -#include <QtCore/QDir> +#include <QDir> #include <QProcess> #include <QDebug> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.44.0/src/kconfig_compiler/kconfig_compiler.cpp new/kconfig-5.45.0/src/kconfig_compiler/kconfig_compiler.cpp --- old/kconfig-5.44.0/src/kconfig_compiler/kconfig_compiler.cpp 2018-03-03 11:01:39.000000000 +0100 +++ new/kconfig-5.45.0/src/kconfig_compiler/kconfig_compiler.cpp 2018-04-07 21:33:28.000000000 +0200 @@ -26,14 +26,14 @@ // Compiling this file with this flag is just crazy #undef QT_NO_CAST_FROM_ASCII -#include <QtCore/QCoreApplication> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QSettings> -#include <QtCore/QTextStream> -#include <QtXml/QDomAttr> -#include <QtCore/QRegExp> -#include <QtCore/QStringList> +#include <QCoreApplication> +#include <QFile> +#include <QFileInfo> +#include <QSettings> +#include <QTextStream> +#include <QDomAttr> +#include <QRegExp> +#include <QStringList> #include <qcommandlineparser.h> #include <qcommandlineoption.h> @@ -2244,7 +2244,7 @@ // Header required by singleton implementation if (cfg.singleton) { - cpp << "#include <qglobal.h>" << endl << "#include <QtCore/QFile>" << endl << endl; + cpp << "#include <qglobal.h>" << endl << "#include <QFile>" << endl << endl; } if (cfg.singleton && cfgFileNameArg) { cpp << "#include <QDebug>" << endl << endl; ++++++ kconfig-desktop-translations.patch ++++++ --- /var/tmp/diff_new_pack.eybun4/_old 2018-04-19 15:15:46.772241701 +0200 +++ /var/tmp/diff_new_pack.eybun4/_new 2018-04-19 15:15:46.772241701 +0200 @@ -1,8 +1,8 @@ -Index: kconfig-5.39.0/src/core/kconfig.cpp +Index: kconfig-5.45.0/src/core/kconfig.cpp =================================================================== ---- kconfig-5.39.0.orig/src/core/kconfig.cpp -+++ kconfig-5.39.0/src/core/kconfig.cpp -@@ -982,6 +982,19 @@ QByteArray KConfigPrivate::lookupData(co +--- kconfig-5.45.0.orig/src/core/kconfig.cpp ++++ kconfig-5.45.0/src/core/kconfig.cpp +@@ -983,6 +983,19 @@ QByteArray KConfigPrivate::lookupData(co return it->mValue; } @@ -22,10 +22,10 @@ QString KConfigPrivate::lookupData(const QByteArray &group, const char *key, KEntryMap::SearchFlags flags, bool *expand) const { -Index: kconfig-5.39.0/src/core/kconfig_p.h +Index: kconfig-5.45.0/src/core/kconfig_p.h =================================================================== ---- kconfig-5.39.0.orig/src/core/kconfig_p.h -+++ kconfig-5.39.0/src/core/kconfig_p.h +--- kconfig-5.45.0.orig/src/core/kconfig_p.h ++++ kconfig-5.45.0/src/core/kconfig_p.h @@ -47,6 +47,7 @@ public: QString lookupData(const QByteArray &group, const char *key, KEntryMap::SearchFlags flags, bool *expand) const; @@ -34,10 +34,10 @@ void putData(const QByteArray &group, const char *key, const QByteArray &value, KConfigBase::WriteConfigFlags flags, bool expand = false); -Index: kconfig-5.39.0/src/core/kconfigdata.h +Index: kconfig-5.45.0/src/core/kconfigdata.h =================================================================== ---- kconfig-5.39.0.orig/src/core/kconfigdata.h -+++ kconfig-5.39.0/src/core/kconfigdata.h +--- kconfig-5.45.0.orig/src/core/kconfigdata.h ++++ kconfig-5.45.0/src/core/kconfigdata.h @@ -180,6 +180,19 @@ public: Iterator findExactEntry(const QByteArray &group, const QByteArray &key = QByteArray(), SearchFlags flags = SearchFlags()); @@ -58,11 +58,11 @@ Iterator findEntry(const QByteArray &group, const QByteArray &key = QByteArray(), SearchFlags flags = SearchFlags()); -Index: kconfig-5.39.0/src/core/kconfiggroup.cpp +Index: kconfig-5.45.0/src/core/kconfiggroup.cpp =================================================================== ---- kconfig-5.39.0.orig/src/core/kconfiggroup.cpp -+++ kconfig-5.39.0/src/core/kconfiggroup.cpp -@@ -1200,6 +1200,18 @@ bool KConfigGroup::hasKey(const char *ke +--- kconfig-5.45.0.orig/src/core/kconfiggroup.cpp ++++ kconfig-5.45.0/src/core/kconfiggroup.cpp +@@ -1201,6 +1201,18 @@ bool KConfigGroup::hasKey(const char *ke return !config()->d_func()->lookupData(d->fullName(), key, flags).isNull(); } @@ -81,10 +81,10 @@ bool KConfigGroup::hasKey(const QString &key) const { return hasKey(key.toUtf8().constData()); -Index: kconfig-5.39.0/src/core/kconfiggroup.h +Index: kconfig-5.45.0/src/core/kconfiggroup.h =================================================================== ---- kconfig-5.39.0.orig/src/core/kconfiggroup.h -+++ kconfig-5.39.0/src/core/kconfiggroup.h +--- kconfig-5.45.0.orig/src/core/kconfiggroup.h ++++ kconfig-5.45.0/src/core/kconfiggroup.h @@ -623,6 +623,11 @@ public: */ QMap<QString, QString> entryMap() const; @@ -97,12 +97,12 @@ protected: bool hasGroupImpl(const QByteArray &group) const Q_DECL_OVERRIDE; KConfigGroup groupImpl(const QByteArray &b) Q_DECL_OVERRIDE; -Index: kconfig-5.39.0/src/core/kdesktopfile.cpp +Index: kconfig-5.45.0/src/core/kdesktopfile.cpp =================================================================== ---- kconfig-5.39.0.orig/src/core/kdesktopfile.cpp -+++ kconfig-5.39.0/src/core/kdesktopfile.cpp +--- kconfig-5.45.0.orig/src/core/kdesktopfile.cpp ++++ kconfig-5.45.0/src/core/kdesktopfile.cpp @@ -29,6 +29,7 @@ - #include <QtCore/QFileInfo> + #include <QFileInfo> #include <QUrl> #include <qstandardpaths.h> +#include <libintl.h> @@ -167,11 +167,11 @@ } QString KDesktopFile::readPath() const -Index: kconfig-5.39.0/src/core/kdesktopfile.h +Index: kconfig-5.45.0/src/core/kdesktopfile.h =================================================================== ---- kconfig-5.39.0.orig/src/core/kdesktopfile.h -+++ kconfig-5.39.0/src/core/kdesktopfile.h -@@ -250,6 +250,8 @@ protected: +--- kconfig-5.45.0.orig/src/core/kdesktopfile.h ++++ kconfig-5.45.0/src/core/kdesktopfile.h +@@ -255,6 +255,8 @@ protected: // virtual void virtual_hook( int id, void* data ); private:
