Hello community, here is the log from the commit of package kconfig for openSUSE:Factory checked in at 2018-01-22 15:58:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kconfig (Old) and /work/SRC/openSUSE:Factory/.kconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kconfig" Mon Jan 22 15:58:55 2018 rev:51 rq:566662 version:5.42.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kconfig/kconfig.changes 2018-01-09 14:41:26.572860038 +0100 +++ /work/SRC/openSUSE:Factory/.kconfig.new/kconfig.changes 2018-01-22 15:59:15.975979790 +0100 @@ -1,0 +2,16 @@ +Tue Jan 16 22:50:15 CET 2018 - [email protected] + +- Update to 5.42.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.42.0.php +- Changes since 5.41.0: + * Remove obsolete reviewboardrc file + * Remove cmake warning about generating moc file + * API docs: Sergio suggested create(), more readable than winId() + * API docs: full working code, including workaround for Qt issue... + * API docs: explain how to use KWindowConfig from a dialog constructor. + * Deprecate KDesktopFile::sortOrder() + * Fix the result of KDesktopFile::sortOrder() + +------------------------------------------------------------------- Old: ---- kconfig-5.41.0.tar.xz New: ---- kconfig-5.42.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kconfig.spec ++++++ --- /var/tmp/diff_new_pack.U7LMIm/_old 2018-01-22 15:59:16.431958449 +0100 +++ /var/tmp/diff_new_pack.U7LMIm/_new 2018-01-22 15:59:16.431958449 +0100 @@ -1,7 +1,7 @@ # # spec file for package kconfig # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,13 +18,13 @@ %bcond_without lang %define sonum 5 -%define _tar_path 5.41 +%define _tar_path 5.42 # 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.41.0 +Version: 5.42.0 Release: 0 BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} ++++++ kconfig-5.41.0.tar.xz -> kconfig-5.42.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.41.0/.reviewboardrc new/kconfig-5.42.0/.reviewboardrc --- old/kconfig-5.41.0/.reviewboardrc 2017-12-02 21:02:44.000000000 +0100 +++ new/kconfig-5.42.0/.reviewboardrc 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -REVIEWBOARD_URL = "https://git.reviewboard.kde.org"; -REPOSITORY = 'git://anongit.kde.org/kconfig' -BRANCH = 'master' -TARGET_GROUPS = 'kdeframeworks' -TARGET_PEOPLE = 'mdawson' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.41.0/CMakeLists.txt new/kconfig-5.42.0/CMakeLists.txt --- old/kconfig-5.41.0/CMakeLists.txt 2017-12-02 21:02:44.000000000 +0100 +++ new/kconfig-5.42.0/CMakeLists.txt 2018-01-07 17:16:29.000000000 +0100 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.41.0") # handled by release scripts +set(KF5_VERSION "5.42.0") # handled by release scripts project(KConfig VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.41.0 NO_MODULE) +find_package(ECM 5.42.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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.41.0/KF5ConfigMacros.cmake new/kconfig-5.42.0/KF5ConfigMacros.cmake --- old/kconfig-5.41.0/KF5ConfigMacros.cmake 2017-12-02 21:02:44.000000000 +0100 +++ new/kconfig-5.42.0/KF5ConfigMacros.cmake 2018-01-07 17:16:29.000000000 +0100 @@ -95,11 +95,12 @@ MAIN_DEPENDENCY ${_tmp_FILE} DEPENDS ${_kcfg_FILE}) + set_source_files_properties(${_header_FILE} PROPERTIES SKIP_AUTOMOC ON) # don't run automoc on this file + set_source_files_properties(${_src_FILE} PROPERTIES SKIP_AUTOMOC ON) # don't run automoc on this file + if(ARG_GENERATE_MOC) list(APPEND sources ${_moc_FILE}) qt5_generate_moc(${_header_FILE} ${_moc_FILE}) - set_property(SOURCE ${_header_FILE} PROPERTY SKIP_AUTOMOC TRUE) # don't run automoc on this file - set_property(SOURCE ${_src_FILE} PROPERTY SKIP_AUTOMOC TRUE) # don't run automoc on this file set_property(SOURCE ${_src_FILE} APPEND PROPERTY OBJECT_DEPENDS ${_moc_FILE} ) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.41.0/autotests/kdesktopfiletest.cpp new/kconfig-5.42.0/autotests/kdesktopfiletest.cpp --- old/kconfig-5.41.0/autotests/kdesktopfiletest.cpp 2017-12-02 21:02:44.000000000 +0100 +++ new/kconfig-5.42.0/autotests/kdesktopfiletest.cpp 2018-01-07 17:16:29.000000000 +0100 @@ -62,6 +62,27 @@ QCOMPARE(df.fileName(), QFileInfo(fileName).canonicalFilePath()); } +#ifndef KDE_NO_DEPRECATED +void KDesktopFileTest::testReadDirectory() +{ + QTemporaryFile file("testReadDirectoryXXXXXX.directory"); + QVERIFY(file.open()); + const QString fileName = file.fileName(); + QTextStream ts(&file); + ts << + "[Desktop Entry]\n" + "Type=Directory\n" + "SortOrder=2.desktop;1.desktop;\n" + "\n"; + file.close(); + QVERIFY(QFile::exists(fileName)); + KDesktopFile df(fileName); + QCOMPARE(df.readType(), QString::fromLatin1("Directory")); + QCOMPARE(df.sortOrder(), QStringList() << QString::fromLatin1("2.desktop") + << QString::fromLatin1("1.desktop")); +} +#endif + void KDesktopFileTest::testReadLocalized_data() { QTest::addColumn<QLocale>("locale"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.41.0/autotests/kdesktopfiletest.h new/kconfig-5.42.0/autotests/kdesktopfiletest.h --- old/kconfig-5.41.0/autotests/kdesktopfiletest.h 2017-12-02 21:02:44.000000000 +0100 +++ new/kconfig-5.42.0/autotests/kdesktopfiletest.h 2018-01-07 17:16:29.000000000 +0100 @@ -27,6 +27,7 @@ private Q_SLOTS: void initTestCase(); void testRead(); + void testReadDirectory(); void testReadLocalized_data(); void testReadLocalized(); void testUnsuccessfulTryExec(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.41.0/po/ca/kconfig5_qt.po new/kconfig-5.42.0/po/ca/kconfig5_qt.po --- old/kconfig-5.41.0/po/ca/kconfig5_qt.po 2017-12-02 21:02:44.000000000 +0100 +++ new/kconfig-5.42.0/po/ca/kconfig5_qt.po 2018-01-07 17:16:29.000000000 +0100 @@ -11,8 +11,8 @@ "Project-Id-Version: kconfig5_qt\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-11 02:17+0000\n" -"PO-Revision-Date: 2017-08-24 14:18+0100\n" -"Last-Translator: Antoni Bella Pérez <[email protected]>\n" +"PO-Revision-Date: 2017-12-10 22:34+0100\n" +"Last-Translator: Josep Ma. Ferrer <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca\n" "MIME-Version: 1.0\n" @@ -467,7 +467,7 @@ "files" msgstr "" "Només per a les proves unitàries: usa directoris per a proves que es " -"mantenen allunyants dels fitxers reals de l'usuari" +"mantenen allunyats dels fitxers reals de l'usuari" #: kconf_update/kconf_update.cpp:957 msgctxt "main|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.41.0/po/ca@valencia/kconfig5_qt.po new/kconfig-5.42.0/po/ca@valencia/kconfig5_qt.po --- old/kconfig-5.41.0/po/ca@valencia/kconfig5_qt.po 2017-12-02 21:02:44.000000000 +0100 +++ new/kconfig-5.42.0/po/ca@valencia/kconfig5_qt.po 2018-01-07 17:16:29.000000000 +0100 @@ -11,8 +11,8 @@ "Project-Id-Version: kconfig5_qt\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-11 02:17+0000\n" -"PO-Revision-Date: 2017-08-24 14:18+0100\n" -"Last-Translator: Antoni Bella Pérez <[email protected]>\n" +"PO-Revision-Date: 2017-12-10 22:34+0100\n" +"Last-Translator: Josep Ma. Ferrer <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca@valencia\n" "MIME-Version: 1.0\n" @@ -467,7 +467,7 @@ "files" msgstr "" "Només per a les proves unitàries: usa directoris per a proves que es " -"mantenen allunyants dels fitxers reals de l'usuari" +"mantenen allunyats dels fitxers reals de l'usuari" #: kconf_update/kconf_update.cpp:957 msgctxt "main|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.41.0/po/id/kconfig5_qt.po new/kconfig-5.42.0/po/id/kconfig5_qt.po --- old/kconfig-5.41.0/po/id/kconfig5_qt.po 2017-12-02 21:02:44.000000000 +0100 +++ new/kconfig-5.42.0/po/id/kconfig5_qt.po 2018-01-07 17:16:29.000000000 +0100 @@ -3,20 +3,22 @@ # This file is distributed under the same license as the kwriteconfig package. # Gian Giovani <[email protected]>, 2010. # Andhika Padmawan <[email protected]>, 2014. +# Wantoyo <[email protected]>, 2017. # msgid "" msgstr "" "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: 2014-10-19 11:07+0700\n" -"Last-Translator: Andhika Padmawan <[email protected]>\n" +"PO-Revision-Date: 2017-12-20 20:25+0700\n" +"Last-Translator: Wantoyo <[email protected]>\n" "Language-Team: Indonesian <[email protected]>\n" "Language: id\n" "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" +"X-Generator: Lokalize 2.0\n" "X-Qt-Contexts: true\n" #: core/kconfig.cpp:910 @@ -34,7 +36,7 @@ #: core/kemailsettings.cpp:267 msgctxt "KEMailSettings|" msgid "Default" -msgstr "Standar" +msgstr "Baku" #: gui/kstandardshortcut.cpp:73 msgctxt "KStandardShortcut|@action" @@ -139,7 +141,7 @@ #: gui/kstandardshortcut.cpp:99 msgctxt "KStandardShortcut|@action Go to main page" msgid "Home" -msgstr "Rumah" +msgstr "Beranda" #: gui/kstandardshortcut.cpp:100 msgctxt "KStandardShortcut|@action Beginning of document" @@ -229,7 +231,7 @@ #: gui/kstandardshortcut.cpp:121 msgctxt "KStandardShortcut|@action" msgid "Show Menu Bar" -msgstr "Tampilkan Batang Menu" +msgstr "Tampilkan Bilah Menu" #: gui/kstandardshortcut.cpp:122 msgctxt "KStandardShortcut|@action" @@ -334,7 +336,7 @@ #: gui/kstandardshortcut.cpp:148 msgctxt "KStandardShortcut|@action" msgid "Zoom" -msgstr "Zum" +msgstr "Perbesaran" #: gui/kstandardshortcut.cpp:149 msgctxt "KStandardShortcut|@action" @@ -369,12 +371,12 @@ #: gui/kstandardshortcut.cpp:155 msgctxt "KStandardShortcut|@action" msgid "Show Toolbar" -msgstr "Tampilkan Batang Alat" +msgstr "Tampilkan Bilah Alat" #: gui/kstandardshortcut.cpp:156 msgctxt "KStandardShortcut|@action" msgid "Show Statusbar" -msgstr "Tampilkan Batang Status" +msgstr "Tampilkan Bilah Status" #: gui/kstandardshortcut.cpp:157 msgctxt "KStandardShortcut|@action" @@ -389,17 +391,17 @@ #: gui/kstandardshortcut.cpp:159 msgctxt "KStandardShortcut|@action" msgid "Preferences" -msgstr "Pengaturan" +msgstr "Setelan" #: gui/kstandardshortcut.cpp:160 msgctxt "KStandardShortcut|@action" msgid "Configure Toolbars" -msgstr "Atur Batang Alat" +msgstr "Konfigurasi Bilah Alat" #: gui/kstandardshortcut.cpp:161 msgctxt "KStandardShortcut|@action" msgid "Configure Notifications" -msgstr "Atur Notifikasi" +msgstr "Konfigurasi Notifikasi" #: gui/kstandardshortcut.cpp:162 msgctxt "KStandardShortcut|@action" @@ -409,7 +411,7 @@ #: gui/kstandardshortcut.cpp:163 msgctxt "KStandardShortcut|@action" msgid "Report Bug" -msgstr "Laporkan Kutu" +msgstr "Laporkan Bug" #: gui/kstandardshortcut.cpp:164 msgctxt "KStandardShortcut|@action" @@ -486,12 +488,12 @@ #: kconfig_compiler/kconfig_compiler.cpp:1576 msgctxt "main|" msgid "Display software license." -msgstr "Tampilkan lisensi peranti lunak." +msgstr "Tampilkan lisensi perangkat lunak." #: kreadconfig/kreadconfig.cpp:56 kreadconfig/kwriteconfig.cpp:35 msgctxt "main|" msgid "Use <file> instead of global config" -msgstr "Gunakan <file> daripada pengaturan global" +msgstr "Gunakan <file> daripada setelan global" #: kreadconfig/kreadconfig.cpp:57 kreadconfig/kwriteconfig.cpp:36 msgctxt "main|" @@ -506,7 +508,7 @@ #: kreadconfig/kreadconfig.cpp:59 msgctxt "main|" msgid "Default value" -msgstr "Nilai standar" +msgstr "Nilai baku" #: kreadconfig/kreadconfig.cpp:60 msgctxt "main|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.41.0/po/ko/kconfig5_qt.po new/kconfig-5.42.0/po/ko/kconfig5_qt.po --- old/kconfig-5.41.0/po/ko/kconfig5_qt.po 2017-12-02 21:02:44.000000000 +0100 +++ new/kconfig-5.42.0/po/ko/kconfig5_qt.po 2018-01-07 17:16:29.000000000 +0100 @@ -1,14 +1,14 @@ # Translation of kwriteconfig to Korean. # Copyright (C) 2007 This_file_is_part_of_KDE # This file is distributed under the same license as the 2007 package. -# Shinjo Park <[email protected]>, 2007, 2014, 2015, 2016. +# Shinjo Park <[email protected]>, 2007, 2014, 2015, 2016, 2017. # msgid "" msgstr "" "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: 2016-10-20 23:13+0100\n" +"PO-Revision-Date: 2017-12-02 20:37+0100\n" "Last-Translator: Shinjo Park <[email protected]>\n" "Language-Team: Korean <[email protected]>\n" "Language: ko\n" @@ -427,20 +427,14 @@ msgstr "KDE 정보" #: gui/kstandardshortcut.cpp:167 -#, fuzzy -#| msgctxt "KStandardShortcut|@action" -#| msgid "Delete File" msgctxt "KStandardShortcut|@action" msgid "Delete" -msgstr "파일 삭제" +msgstr "삭제" #: gui/kstandardshortcut.cpp:168 -#, fuzzy -#| msgctxt "KStandardShortcut|@action" -#| msgid "Rename File" msgctxt "KStandardShortcut|@action" msgid "Rename" -msgstr "파일 이름 바꾸기" +msgstr "이름 바꾸기" #: gui/kstandardshortcut.cpp:169 msgctxt "KStandardShortcut|@action" @@ -532,4 +526,5 @@ #: kreadconfig/kwriteconfig.cpp:39 msgctxt "main|" msgid "The value to write. Mandatory, on a shell use '' for empty" -msgstr "쓸 값입니다. 필수적이며, 셸에서 빈 값을 사용하려면 ''을 사용하십시오" +msgstr "" +"기록할 값입니다. 필수적이며, 셸에서 빈 값을 사용하려면 ''을 사용하십시오" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.41.0/po/pt_BR/kconfig5_qt.po new/kconfig-5.42.0/po/pt_BR/kconfig5_qt.po --- old/kconfig-5.41.0/po/pt_BR/kconfig5_qt.po 2017-12-02 21:02:44.000000000 +0100 +++ new/kconfig-5.42.0/po/pt_BR/kconfig5_qt.po 2018-01-07 17:16:29.000000000 +0100 @@ -5,14 +5,14 @@ # Henrique Pinto <[email protected]>, 2003. # Diniz Bortolotto <[email protected]>, 2007. # Fernando Boaglio <[email protected]>, 2008. -# Luiz Fernando Ranghetti <[email protected]>, 2009, 2016. +# Luiz Fernando Ranghetti <[email protected]>, 2009, 2016, 2017. # André Marcelo Alvarenga <[email protected]>, 2009, 2014, 2015. msgid "" msgstr "" "Project-Id-Version: kconfig5_qt\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-11 02:17+0000\n" -"PO-Revision-Date: 2016-09-09 09:42-0300\n" +"PO-Revision-Date: 2017-12-12 15:55-0300\n" "Last-Translator: Luiz Fernando Ranghetti <[email protected]>\n" "Language-Team: Portuguese <[email protected]>\n" "Language: pt_BR\n" @@ -26,7 +26,7 @@ #: core/kconfig.cpp:910 msgctxt "KConfig|" msgid "Please contact your system administrator." -msgstr "Por favor, contate o administrador do seu sistema." +msgstr "Contate o administrador do seu sistema." #: core/kconfigini.cpp:578 #, qt-format @@ -431,20 +431,14 @@ msgstr "Sobre o KDE" #: gui/kstandardshortcut.cpp:167 -#, fuzzy -#| msgctxt "KStandardShortcut|@action" -#| msgid "Delete File" msgctxt "KStandardShortcut|@action" msgid "Delete" -msgstr "Excluir arquivo" +msgstr "Remover" #: gui/kstandardshortcut.cpp:168 -#, fuzzy -#| msgctxt "KStandardShortcut|@action" -#| msgid "Rename File" msgctxt "KStandardShortcut|@action" msgid "Rename" -msgstr "Renomear arquivo" +msgstr "Renomear" #: gui/kstandardshortcut.cpp:169 msgctxt "KStandardShortcut|@action" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.41.0/po/sr/kconfig5_qt.po new/kconfig-5.42.0/po/sr/kconfig5_qt.po --- old/kconfig-5.41.0/po/sr/kconfig5_qt.po 2017-12-02 21:02:44.000000000 +0100 +++ new/kconfig-5.42.0/po/sr/kconfig5_qt.po 2018-01-07 17:16:29.000000000 +0100 @@ -3,7 +3,6 @@ msgid "" msgstr "" "Project-Id-Version: kconfig5_qt\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-11 02:17+0000\n" "PO-Revision-Date: 2017-08-21 22:33+0200\n" "Last-Translator: Chusslove Illich <[email protected]>\n" @@ -18,8 +17,9 @@ "X-Text-Markup: qtrich\n" "X-Environment: kde\n" "X-Qt-Contexts: true\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -#: core/kconfig.cpp:909 +#: core/kconfig.cpp:910 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Обратите се систем-администратору." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.41.0/po/sr@ijekavian/kconfig5_qt.po new/kconfig-5.42.0/po/sr@ijekavian/kconfig5_qt.po --- old/kconfig-5.41.0/po/sr@ijekavian/kconfig5_qt.po 2017-12-02 21:02:44.000000000 +0100 +++ new/kconfig-5.42.0/po/sr@ijekavian/kconfig5_qt.po 2018-01-07 17:16:29.000000000 +0100 @@ -3,7 +3,6 @@ msgid "" msgstr "" "Project-Id-Version: kconfig5_qt\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-11 02:17+0000\n" "PO-Revision-Date: 2017-08-21 22:33+0200\n" "Last-Translator: Chusslove Illich <[email protected]>\n" @@ -18,8 +17,9 @@ "X-Text-Markup: qtrich\n" "X-Environment: kde\n" "X-Qt-Contexts: true\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -#: core/kconfig.cpp:909 +#: core/kconfig.cpp:910 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Обратите се систем-администратору." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.41.0/po/sr@ijekavianlatin/kconfig5_qt.po new/kconfig-5.42.0/po/sr@ijekavianlatin/kconfig5_qt.po --- old/kconfig-5.41.0/po/sr@ijekavianlatin/kconfig5_qt.po 2017-12-02 21:02:44.000000000 +0100 +++ new/kconfig-5.42.0/po/sr@ijekavianlatin/kconfig5_qt.po 2018-01-07 17:16:29.000000000 +0100 @@ -3,7 +3,6 @@ msgid "" msgstr "" "Project-Id-Version: kconfig5_qt\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-11 02:17+0000\n" "PO-Revision-Date: 2017-08-21 22:33+0200\n" "Last-Translator: Chusslove Illich <[email protected]>\n" @@ -18,8 +17,9 @@ "X-Text-Markup: qtrich\n" "X-Environment: kde\n" "X-Qt-Contexts: true\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -#: core/kconfig.cpp:909 +#: core/kconfig.cpp:910 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Obratite se sistem-administratoru." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.41.0/po/sr@latin/kconfig5_qt.po new/kconfig-5.42.0/po/sr@latin/kconfig5_qt.po --- old/kconfig-5.41.0/po/sr@latin/kconfig5_qt.po 2017-12-02 21:02:44.000000000 +0100 +++ new/kconfig-5.42.0/po/sr@latin/kconfig5_qt.po 2018-01-07 17:16:29.000000000 +0100 @@ -3,7 +3,6 @@ msgid "" msgstr "" "Project-Id-Version: kconfig5_qt\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-11 02:17+0000\n" "PO-Revision-Date: 2017-08-21 22:33+0200\n" "Last-Translator: Chusslove Illich <[email protected]>\n" @@ -18,8 +17,9 @@ "X-Text-Markup: qtrich\n" "X-Environment: kde\n" "X-Qt-Contexts: true\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -#: core/kconfig.cpp:909 +#: core/kconfig.cpp:910 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Obratite se sistem-administratoru." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.41.0/po/zh_CN/kconfig5_qt.po new/kconfig-5.42.0/po/zh_CN/kconfig5_qt.po --- old/kconfig-5.41.0/po/zh_CN/kconfig5_qt.po 2017-12-02 21:02:44.000000000 +0100 +++ new/kconfig-5.42.0/po/zh_CN/kconfig5_qt.po 2018-01-07 17:16:29.000000000 +0100 @@ -9,7 +9,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-11-19 20:11+0100\n" -"PO-Revision-Date: 2017-07-13 11:17-0400\n" +"PO-Revision-Date: 2018-01-05 06:38-0500\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -19,6 +19,12 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: crowdin.com\n" "X-Qt-Contexts: true\n" +"X-Qt-Contexts: true\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: crowdin.com\n" +"X-Crowdin-Project: kdeorg\n" +"X-Crowdin-Language: zh-CN\n" +"X-Crowdin-File: /kf5-trunk/messages/frameworks/kconfig5_qt.pot\n" #: core/kconfig.cpp:910 msgctxt "KConfig|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.41.0/src/core/kdesktopfile.cpp new/kconfig-5.42.0/src/core/kdesktopfile.cpp --- old/kconfig-5.41.0/src/core/kdesktopfile.cpp 2017-12-02 21:02:44.000000000 +0100 +++ new/kconfig-5.42.0/src/core/kdesktopfile.cpp 2018-01-07 17:16:29.000000000 +0100 @@ -326,12 +326,14 @@ //QString //KDesktopFile::resource() const { return backEnd->resource(); } +#ifndef KDE_NO_DEPRECATED QStringList KDesktopFile::sortOrder() const { Q_D(const KDesktopFile); - return d->desktopGroup.readEntry("SortOrder", QStringList()); + return d->desktopGroup.readXdgListEntry("SortOrder"); } +#endif //void KDesktopFile::virtual_hook( int id, void* data ) //{ KConfig::virtual_hook( id, data ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.41.0/src/core/kdesktopfile.h new/kconfig-5.42.0/src/core/kdesktopfile.h --- old/kconfig-5.41.0/src/core/kdesktopfile.h 2017-12-02 21:02:44.000000000 +0100 +++ new/kconfig-5.42.0/src/core/kdesktopfile.h 2018-01-07 17:16:29.000000000 +0100 @@ -214,11 +214,16 @@ */ QString readDocPath() const; +#ifndef KDE_NO_DEPRECATED /** * Returns the entry of the "SortOrder=" entry. * @return the value of the "SortOrder=" entry. + * @deprecated since 5.42 + * SortOrder was used to specify the order of menu items, but + * the Desktop Menu Specification defines another mechanism for it. */ - QStringList sortOrder() const; + KCONFIGCORE_DEPRECATED QStringList sortOrder() const; +#endif /** * Whether the entry should be suppressed in menus. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.41.0/src/gui/kwindowconfig.h new/kconfig-5.42.0/src/gui/kwindowconfig.h --- old/kconfig-5.41.0/src/gui/kwindowconfig.h 2017-12-02 21:02:44.000000000 +0100 +++ new/kconfig-5.42.0/src/gui/kwindowconfig.h 2018-01-07 17:16:29.000000000 +0100 @@ -49,6 +49,19 @@ * Restores the dialog's size from the configuration according to * the screen size. * + * If you're calling this from a constructor (for a mainwindow or dialog, for instance) + * you should first call winId() so that a QWindow is created, then you can call windowHandle() + * to pass to this method. + * + * Example code: + * @code + * create(); // ensure there's a window created + * const QSize availableSize = windowHandle()->screen()->availableSize(); + * windowHandle()->resize(availableSize.width() * 0.7, availableSize.height() * 0.5); // default size + * KWindowConfig::restoreWindowSize(windowHandle(), KSharedConfig::openConfig()->group("MyDialog")); + * resize(windowHandle()->size()); // workaround for QTBUG-40584 + * @endcode + * * @note the group must be set before calling * * @param window The window to restore size.
