Hello community, here is the log from the commit of package kconfig for openSUSE:Factory checked in at 2015-06-23 12:06:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kconfig (Old) and /work/SRC/openSUSE:Factory/.kconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kconfig" Changes: -------- --- /work/SRC/openSUSE:Factory/kconfig/kconfig.changes 2015-05-18 22:19:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kconfig.new/kconfig.changes 2015-06-23 12:06:44.000000000 +0200 @@ -1,0 +2,12 @@ +Sun Jun 7 19:07:14 UTC 2015 - hrvoje.sen...@gmail.com + +- Update to 5.11.0 + * Prevent crash if QWindow::screen() is null + * Add KConfigGui::setSessionConfig() (kde#346768) + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.11.0.php +- Drop 0001-ensure-platform-window-resize-processing.patch and + 0001-Add-KConfigGui-setSessionConfig.patch, merged upstream +- Delete 0001-ensure-platform-window-resize-processing.patch + +------------------------------------------------------------------- Old: ---- 0001-Add-KConfigGui-setSessionConfig.patch 0001-ensure-platform-window-resize-processing.patch kconfig-5.10.0.tar.xz New: ---- kconfig-5.11.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kconfig.spec ++++++ --- /var/tmp/diff_new_pack.9u7ruj/_old 2015-06-23 12:06:44.000000000 +0200 +++ /var/tmp/diff_new_pack.9u7ruj/_new 2015-06-23 12:06:44.000000000 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define sonum 5 -%define _tar_path 5.10 +%define _tar_path 5.11 Name: kconfig -Version: 5.10.0 +Version: 5.11.0 Release: 0 BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= %{_tar_path} @@ -38,10 +38,6 @@ Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf -# PATCH-FIX-UPSTREAM 0001-ensure-platform-window-resize-processing.patch -- https://git.reviewboard.kde.org/r/119593/ -Patch0: 0001-ensure-platform-window-resize-processing.patch -# PATCH-FIX-UPSTREAM 0001-Add-KConfigGui-setSessionConfig.patch -Patch1: 0001-Add-KConfigGui-setSessionConfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -125,8 +121,6 @@ %lang_package -n libKF5ConfigCore%sonum %prep %setup -q -#patch0 -p1 -%patch1 -p1 %build %cmake_kf5 -d build -- -Dlconvert_executable=%{_kf5_libdir}/qt5/bin/lconvert ++++++ kconfig-5.10.0.tar.xz -> kconfig-5.11.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.10.0/CMakeLists.txt new/kconfig-5.11.0/CMakeLists.txt --- old/kconfig-5.10.0/CMakeLists.txt 2015-05-03 17:06:01.000000000 +0200 +++ new/kconfig-5.11.0/CMakeLists.txt 2015-06-06 23:10:11.000000000 +0200 @@ -2,7 +2,11 @@ project(KConfig) -find_package(ECM 5.10.0 REQUIRED NO_MODULE) +include(FeatureSummary) +find_package(ECM 5.11.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.2.0) @@ -12,14 +16,14 @@ include(KDEFrameworkCompilerSettings) include(KDECMakeSettings) -include(FeatureSummary) + include(GenerateExportHeader) include(ECMSetupVersion) include(ECMGenerateHeaders) include(ECMMarkNonGuiExecutable) include(ECMPoQmTools) -set(KF5_VERSION "5.10.0") # handled by release scripts +set(KF5_VERSION "5.11.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KCONFIG VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kconfig_version.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.10.0/po/ca/kconfig5_qt.po new/kconfig-5.11.0/po/ca/kconfig5_qt.po --- old/kconfig-5.10.0/po/ca/kconfig5_qt.po 2015-05-03 17:06:01.000000000 +0200 +++ new/kconfig-5.11.0/po/ca/kconfig5_qt.po 2015-06-06 23:10:11.000000000 +0200 @@ -1,24 +1,24 @@ # Translation of kconfig5_qt.po to Catalan -# Copyright (C) 2014 This_file_is_part_of_KDE +# Copyright (C) 2014-2015 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # # Ivan Lloro Boada <antis...@wanadoo.es>, 2004. -# Josep Ma. Ferrer <txe...@gmail.com>, 2007, 2008, 2009, 2014. +# Josep Ma. Ferrer <txe...@gmail.com>, 2007, 2008, 2009, 2014, 2015. # Antoni Bella Pérez <antonibel...@yahoo.com>, 2014. 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: 2014-11-16 21:13+0100\n" +"PO-Revision-Date: 2015-05-23 17:41+0200\n" "Last-Translator: Josep Ma. Ferrer <txe...@gmail.com>\n" "Language-Team: Catalan <kde-i18n...@kde.org>\n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" "X-Qt-Contexts: true\n" @@ -433,7 +433,7 @@ #: kconf_update/kconf_update.cpp:948 msgctxt "main|" msgid "KDE Tool for updating user configuration files" -msgstr "Eina KDE per actualitzar els fitxers de configuració de l'usuari" +msgstr "Eina del KDE per actualitzar els fitxers de configuració d'usuari" #: kconf_update/kconf_update.cpp:950 msgctxt "main|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.10.0/po/nb/kconfig5_qt.po new/kconfig-5.11.0/po/nb/kconfig5_qt.po --- old/kconfig-5.10.0/po/nb/kconfig5_qt.po 2015-05-03 17:06:01.000000000 +0200 +++ new/kconfig-5.11.0/po/nb/kconfig5_qt.po 2015-06-06 23:10:11.000000000 +0200 @@ -1,6 +1,6 @@ # Translation of kconfig5_qt to Norwegian Bokmål # -# Knut Yrvin <kn...@skolelinux.no>, 2003. +# Knut Yrvin <knut.yr...@gmail.com>, 2003. # Bjørn Kvisli <bjorn.kvi...@gmail.com>, 2007. # Bjørn Steensrud <bjor...@skogkatt.homelinux.org>, 2008, 2014. msgid "" @@ -429,17 +429,17 @@ msgid "About KDE" msgstr "Om KDE" -#: kconf_update/kconf_update.cpp:947 +#: kconf_update/kconf_update.cpp:948 msgctxt "main|" msgid "KDE Tool for updating user configuration files" msgstr "KDE-verktøy for å oppdatere brukerens oppsettsfiler" -#: kconf_update/kconf_update.cpp:949 +#: kconf_update/kconf_update.cpp:950 msgctxt "main|" msgid "Keep output results from scripts" msgstr "Behold sluttresultatet fra skript" -#: kconf_update/kconf_update.cpp:950 +#: kconf_update/kconf_update.cpp:951 msgctxt "main|" msgid "Check whether config file itself requires updating" msgstr "Sjekk om oppsettsfila selv trenger oppdatering" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.10.0/po/nn/kconfig5_qt.po new/kconfig-5.11.0/po/nn/kconfig5_qt.po --- old/kconfig-5.10.0/po/nn/kconfig5_qt.po 2015-05-03 17:06:01.000000000 +0200 +++ new/kconfig-5.11.0/po/nn/kconfig5_qt.po 2015-06-06 23:10:11.000000000 +0200 @@ -1,21 +1,21 @@ # Translation of kconfig5_qt to Norwegian Nynorsk # # Håvard Korsvoll <korsv...@skulelinux.no>, 2004. -# Karl Ove Hufthammer <k...@huftis.org>, 2007, 2008. +# Karl Ove Hufthammer <k...@huftis.org>, 2007, 2008, 2015. # Eirik U. Birkeland <eir...@gmail.com>, 2008. 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: 2008-08-03 19:21+0200\n" +"PO-Revision-Date: 2015-06-02 19:26+0100\n" "Last-Translator: Karl Ove Hufthammer <k...@huftis.org>\n" "Language-Team: Norwegian Nynorsk <i18n...@lister.ping.uio.no>\n" "Language: nn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 2.0\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" @@ -25,480 +25,475 @@ #: core/kconfig.cpp:883 msgctxt "KConfig|" msgid "Please contact your system administrator." -msgstr "" +msgstr "Ta kontakt med systemansvarleg." #: core/kconfigini.cpp:576 #, qt-format msgctxt "KConfigIniBackend|" msgid "Configuration file \"%1\" not writable.\n" -msgstr "" +msgstr "Oppsettfila «%1» er ikkje skrivbar.\n" #: core/kemailsettings.cpp:256 core/kemailsettings.cpp:259 #: core/kemailsettings.cpp:267 msgctxt "KEMailSettings|" msgid "Default" -msgstr "" +msgstr "Standard" #: gui/kstandardshortcut.cpp:73 msgctxt "KStandardShortcut|@action" msgid "Open" -msgstr "" +msgstr "Opna" #: gui/kstandardshortcut.cpp:74 msgctxt "KStandardShortcut|@action" msgid "New" -msgstr "" +msgstr "Ny" #: gui/kstandardshortcut.cpp:75 msgctxt "KStandardShortcut|@action" msgid "Close" -msgstr "" +msgstr "Lukk" #: gui/kstandardshortcut.cpp:76 msgctxt "KStandardShortcut|@action" msgid "Save" -msgstr "" +msgstr "Lagra" #: gui/kstandardshortcut.cpp:77 msgctxt "KStandardShortcut|@action" msgid "Print" -msgstr "" +msgstr "Skriv ut" #: gui/kstandardshortcut.cpp:78 msgctxt "KStandardShortcut|@action" msgid "Quit" -msgstr "" +msgstr "Avslutt" #: gui/kstandardshortcut.cpp:81 msgctxt "KStandardShortcut|@action" msgid "Undo" -msgstr "" +msgstr "Angra" #: gui/kstandardshortcut.cpp:82 msgctxt "KStandardShortcut|@action" msgid "Redo" -msgstr "" +msgstr "Gjer om" #: gui/kstandardshortcut.cpp:83 msgctxt "KStandardShortcut|@action" msgid "Cut" -msgstr "" +msgstr "Klipp ut" #: gui/kstandardshortcut.cpp:84 msgctxt "KStandardShortcut|@action" msgid "Copy" -msgstr "" +msgstr "Kopier" #: gui/kstandardshortcut.cpp:85 msgctxt "KStandardShortcut|@action" msgid "Paste" -msgstr "" +msgstr "Lim inn" #: gui/kstandardshortcut.cpp:86 msgctxt "KStandardShortcut|@action" msgid "Paste Selection" -msgstr "" +msgstr "Lim inn utval" #: gui/kstandardshortcut.cpp:88 msgctxt "KStandardShortcut|@action" msgid "Select All" -msgstr "" +msgstr "Merk alt" #: gui/kstandardshortcut.cpp:89 msgctxt "KStandardShortcut|@action" msgid "Deselect" -msgstr "" +msgstr "Fjern merking" #: gui/kstandardshortcut.cpp:90 msgctxt "KStandardShortcut|@action" msgid "Delete Word Backwards" -msgstr "" +msgstr "Slett ord bakover" #: gui/kstandardshortcut.cpp:91 msgctxt "KStandardShortcut|@action" msgid "Delete Word Forward" -msgstr "" +msgstr "Slett ord framover" #: gui/kstandardshortcut.cpp:93 msgctxt "KStandardShortcut|@action" msgid "Find" -msgstr "" +msgstr "Finn" #: gui/kstandardshortcut.cpp:94 msgctxt "KStandardShortcut|@action" msgid "Find Next" -msgstr "" +msgstr "Finn neste" #: gui/kstandardshortcut.cpp:95 msgctxt "KStandardShortcut|@action" msgid "Find Prev" -msgstr "" +msgstr "Finn førre" #: gui/kstandardshortcut.cpp:96 msgctxt "KStandardShortcut|@action" msgid "Replace" -msgstr "" +msgstr "Byt ut" #: gui/kstandardshortcut.cpp:99 msgctxt "KStandardShortcut|@action Go to main page" msgid "Home" -msgstr "" +msgstr "Heim" #: gui/kstandardshortcut.cpp:100 msgctxt "KStandardShortcut|@action Beginning of document" msgid "Begin" -msgstr "" +msgstr "Start" #: gui/kstandardshortcut.cpp:101 msgctxt "KStandardShortcut|@action End of document" msgid "End" -msgstr "" +msgstr "Slutt" #: gui/kstandardshortcut.cpp:102 msgctxt "KStandardShortcut|@action" msgid "Prior" -msgstr "" +msgstr "Førre" #: gui/kstandardshortcut.cpp:103 msgctxt "KStandardShortcut|@action Opposite to Prior" msgid "Next" -msgstr "" +msgstr "Neste" #: gui/kstandardshortcut.cpp:105 msgctxt "KStandardShortcut|@action" msgid "Up" -msgstr "" +msgstr "Opp" #: gui/kstandardshortcut.cpp:106 msgctxt "KStandardShortcut|@action" msgid "Back" -msgstr "" +msgstr "Tilbake" #: gui/kstandardshortcut.cpp:107 msgctxt "KStandardShortcut|@action" msgid "Forward" -msgstr "" +msgstr "Fram" #: gui/kstandardshortcut.cpp:108 msgctxt "KStandardShortcut|@action" msgid "Reload" -msgstr "" +msgstr "Last om att" #: gui/kstandardshortcut.cpp:110 msgctxt "KStandardShortcut|@action" msgid "Beginning of Line" -msgstr "" +msgstr "Starten på linja" #: gui/kstandardshortcut.cpp:111 msgctxt "KStandardShortcut|@action" msgid "End of Line" -msgstr "" +msgstr "Slutten på linja" #: gui/kstandardshortcut.cpp:112 msgctxt "KStandardShortcut|@action" msgid "Go to Line" -msgstr "" +msgstr "Gå til linje" #: gui/kstandardshortcut.cpp:113 msgctxt "KStandardShortcut|@action" msgid "Backward Word" -msgstr "" +msgstr "Gå eitt ord bak" #: gui/kstandardshortcut.cpp:114 msgctxt "KStandardShortcut|@action" msgid "Forward Word" -msgstr "" +msgstr "Gå eitt ord fram" #: gui/kstandardshortcut.cpp:116 msgctxt "KStandardShortcut|@action" msgid "Add Bookmark" -msgstr "" +msgstr "Legg til bokmerke" #: gui/kstandardshortcut.cpp:117 msgctxt "KStandardShortcut|@action" msgid "Zoom In" -msgstr "" +msgstr "Vis større" #: gui/kstandardshortcut.cpp:118 msgctxt "KStandardShortcut|@action" msgid "Zoom Out" -msgstr "" +msgstr "Vis mindre" #: gui/kstandardshortcut.cpp:119 msgctxt "KStandardShortcut|@action" msgid "Full Screen Mode" -msgstr "" +msgstr "Fullskjermsmodus" #: gui/kstandardshortcut.cpp:121 msgctxt "KStandardShortcut|@action" msgid "Show Menu Bar" -msgstr "" +msgstr "Vis menylinje" #: gui/kstandardshortcut.cpp:122 msgctxt "KStandardShortcut|@action" msgid "Activate Next Tab" -msgstr "" +msgstr "Gå til neste fane" #: gui/kstandardshortcut.cpp:123 msgctxt "KStandardShortcut|@action" msgid "Activate Previous Tab" -msgstr "" +msgstr "Gå til førre fane" #: gui/kstandardshortcut.cpp:126 msgctxt "KStandardShortcut|@action" msgid "Help" -msgstr "" +msgstr "Hjelp" #: gui/kstandardshortcut.cpp:127 msgctxt "KStandardShortcut|@action" msgid "What's This" -msgstr "" +msgstr "Kva er dette" #: gui/kstandardshortcut.cpp:130 msgctxt "KStandardShortcut|@action" msgid "Text Completion" -msgstr "" +msgstr "Tekstfullføring" #: gui/kstandardshortcut.cpp:131 msgctxt "KStandardShortcut|@action" msgid "Previous Completion Match" -msgstr "" +msgstr "Førre fullføringstreff" #: gui/kstandardshortcut.cpp:132 msgctxt "KStandardShortcut|@action" msgid "Next Completion Match" -msgstr "" +msgstr "Neste fullføringstreff" #: gui/kstandardshortcut.cpp:133 msgctxt "KStandardShortcut|@action" msgid "Substring Completion" -msgstr "" +msgstr "Delstrengfullføring" #: gui/kstandardshortcut.cpp:135 msgctxt "KStandardShortcut|@action" msgid "Previous Item in List" -msgstr "" +msgstr "Førre element i lista" #: gui/kstandardshortcut.cpp:136 msgctxt "KStandardShortcut|@action" msgid "Next Item in List" -msgstr "" +msgstr "Neste element i lista" #: gui/kstandardshortcut.cpp:138 msgctxt "KStandardShortcut|@action" msgid "Open Recent" -msgstr "" +msgstr "Nyleg brukt" #: gui/kstandardshortcut.cpp:139 msgctxt "KStandardShortcut|@action" msgid "Save As" -msgstr "" +msgstr "Lagra som" #: gui/kstandardshortcut.cpp:140 msgctxt "KStandardShortcut|@action" msgid "Revert" -msgstr "" +msgstr "Tilbakestill" #: gui/kstandardshortcut.cpp:141 msgctxt "KStandardShortcut|@action" msgid "Print Preview" -msgstr "" +msgstr "Førehandsvising" #: gui/kstandardshortcut.cpp:142 msgctxt "KStandardShortcut|@action" msgid "Mail" -msgstr "" +msgstr "E-post" #: gui/kstandardshortcut.cpp:143 msgctxt "KStandardShortcut|@action" msgid "Clear" -msgstr "" +msgstr "Tøm" #: gui/kstandardshortcut.cpp:144 msgctxt "KStandardShortcut|@action" msgid "Actual Size" -msgstr "" +msgstr "Verkeleg storleik" #: gui/kstandardshortcut.cpp:145 msgctxt "KStandardShortcut|@action" msgid "Fit To Page" -msgstr "" +msgstr "Tilpass til side" #: gui/kstandardshortcut.cpp:146 msgctxt "KStandardShortcut|@action" msgid "Fit To Width" -msgstr "" +msgstr "Tilpass til sidebreidd" #: gui/kstandardshortcut.cpp:147 msgctxt "KStandardShortcut|@action" msgid "Fit To Height" -msgstr "" +msgstr "Tilpass til sidehøgd" #: gui/kstandardshortcut.cpp:148 msgctxt "KStandardShortcut|@action" msgid "Zoom" -msgstr "" +msgstr "Forstørr/forminsk" #: gui/kstandardshortcut.cpp:149 msgctxt "KStandardShortcut|@action" msgid "Goto" -msgstr "" +msgstr "Gå til" #: gui/kstandardshortcut.cpp:150 msgctxt "KStandardShortcut|@action" msgid "Goto Page" -msgstr "" +msgstr "Gå til side" #: gui/kstandardshortcut.cpp:151 msgctxt "KStandardShortcut|@action" msgid "Document Back" -msgstr "" +msgstr "Førre dokument" #: gui/kstandardshortcut.cpp:152 msgctxt "KStandardShortcut|@action" msgid "Document Forward" -msgstr "" +msgstr "Neste dokument" #: gui/kstandardshortcut.cpp:153 msgctxt "KStandardShortcut|@action" msgid "Edit Bookmarks" -msgstr "" +msgstr "Rediger bokmerke" #: gui/kstandardshortcut.cpp:154 msgctxt "KStandardShortcut|@action" msgid "Spelling" -msgstr "" +msgstr "Stavekontroll" #: gui/kstandardshortcut.cpp:155 msgctxt "KStandardShortcut|@action" msgid "Show Toolbar" -msgstr "" +msgstr "Vis verktøylinje" #: gui/kstandardshortcut.cpp:156 msgctxt "KStandardShortcut|@action" msgid "Show Statusbar" -msgstr "" +msgstr "Vis statuslinje" #: gui/kstandardshortcut.cpp:157 msgctxt "KStandardShortcut|@action" msgid "Save Options" -msgstr "" +msgstr "Lagra innstillingar" #: gui/kstandardshortcut.cpp:158 msgctxt "KStandardShortcut|@action" msgid "Key Bindings" -msgstr "" +msgstr "Tastebindingar" #: gui/kstandardshortcut.cpp:159 msgctxt "KStandardShortcut|@action" msgid "Preferences" -msgstr "" +msgstr "Innstillingar" #: gui/kstandardshortcut.cpp:160 msgctxt "KStandardShortcut|@action" msgid "Configure Toolbars" -msgstr "" +msgstr "Set opp verktøylinjer" #: gui/kstandardshortcut.cpp:161 msgctxt "KStandardShortcut|@action" msgid "Configure Notifications" -msgstr "" +msgstr "Set opp varslingar" #: gui/kstandardshortcut.cpp:162 msgctxt "KStandardShortcut|@action" msgid "Tip Of Day" -msgstr "" +msgstr "Dagens tips" #: gui/kstandardshortcut.cpp:163 msgctxt "KStandardShortcut|@action" msgid "Report Bug" -msgstr "" +msgstr "Meld frå om feil" #: gui/kstandardshortcut.cpp:164 msgctxt "KStandardShortcut|@action" msgid "Switch Application Language" -msgstr "" +msgstr "Byt programspråk" #: gui/kstandardshortcut.cpp:165 msgctxt "KStandardShortcut|@action" msgid "About Application" -msgstr "" +msgstr "Om programmet" #: gui/kstandardshortcut.cpp:166 msgctxt "KStandardShortcut|@action" msgid "About KDE" -msgstr "" +msgstr "Om KDE" -#: kconf_update/kconf_update.cpp:947 +#: kconf_update/kconf_update.cpp:948 msgctxt "main|" msgid "KDE Tool for updating user configuration files" -msgstr "" +msgstr "KDE-verktøy for oppdatering av brukaroppsett" -#: kconf_update/kconf_update.cpp:949 +#: kconf_update/kconf_update.cpp:950 msgctxt "main|" msgid "Keep output results from scripts" -msgstr "" +msgstr "Ta vare på utdata frå skript" -#: kconf_update/kconf_update.cpp:950 +#: kconf_update/kconf_update.cpp:951 msgctxt "main|" msgid "Check whether config file itself requires updating" -msgstr "" +msgstr "Sjekk om oppsettfila treng oppdatering" #: kconfig_compiler/kconfig_compiler.cpp:1571 msgctxt "main|" msgid "Directory to generate files in [.]" -msgstr "" +msgstr "Mappa som dei genererte filene skal lagrast i [.]." #: kconfig_compiler/kconfig_compiler.cpp:1572 msgctxt "main|" msgid "directory" -msgstr "" +msgstr "mappe" #: kconfig_compiler/kconfig_compiler.cpp:1575 msgctxt "main|" msgid "Display software license." -msgstr "" +msgstr "Vis programvarelisens." #: kreadconfig/kreadconfig.cpp:56 kreadconfig/kwriteconfig.cpp:35 -#, fuzzy msgctxt "main|" msgid "Use <file> instead of global config" -msgstr "Bruk <fil> istadenfor standardoppsett" +msgstr "Bruk <fil> i staden for standardoppsett" #: kreadconfig/kreadconfig.cpp:57 kreadconfig/kwriteconfig.cpp:36 -#, fuzzy msgctxt "main|" msgid "Group to look in. Use repeatedly for nested groups." msgstr "Gruppa det skal leitast i. Bruk fleire gongar for nøsta grupper." #: kreadconfig/kreadconfig.cpp:58 kreadconfig/kwriteconfig.cpp:37 -#, fuzzy msgctxt "main|" msgid "Key to look for" -msgstr "Nøkkelord" +msgstr "Nøkkel å sjå etter" #: kreadconfig/kreadconfig.cpp:59 msgctxt "main|" msgid "Default value" -msgstr "" +msgstr "Standardverdi" #: kreadconfig/kreadconfig.cpp:60 msgctxt "main|" msgid "Type of variable" -msgstr "" +msgstr "Variabeltype" #: kreadconfig/kwriteconfig.cpp:38 -#, fuzzy msgctxt "main|" msgid "" "Type of variable. Use \"bool\" for a boolean, otherwise it is treated as a " "string" msgstr "" -"Variabeltype. Bruk «bool» for boolske verdiar, elles vert det handsama som " -"ein tekststreng" +"Variabeltype. Bruk «bool» for boolske verdiar; elles vert det handsama som " +"ein tekststreng." #: kreadconfig/kwriteconfig.cpp:39 -#, fuzzy msgctxt "main|" msgid "The value to write. Mandatory, on a shell use '' for empty" msgstr "Verdien som skal skrivast. I eit skal må du bruka '' for tomme verdiar" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.10.0/po/se/kconfig5_qt.po new/kconfig-5.11.0/po/se/kconfig5_qt.po --- old/kconfig-5.10.0/po/se/kconfig5_qt.po 2015-05-03 17:06:01.000000000 +0200 +++ new/kconfig-5.11.0/po/se/kconfig5_qt.po 2015-06-06 23:10:11.000000000 +0200 @@ -427,17 +427,17 @@ msgid "About KDE" msgstr "" -#: kconf_update/kconf_update.cpp:947 +#: kconf_update/kconf_update.cpp:948 msgctxt "main|" msgid "KDE Tool for updating user configuration files" msgstr "" -#: kconf_update/kconf_update.cpp:949 +#: kconf_update/kconf_update.cpp:950 msgctxt "main|" msgid "Keep output results from scripts" msgstr "" -#: kconf_update/kconf_update.cpp:950 +#: kconf_update/kconf_update.cpp:951 msgctxt "main|" msgid "Check whether config file itself requires updating" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.10.0/po/sr/kconfig5_qt.po new/kconfig-5.11.0/po/sr/kconfig5_qt.po --- old/kconfig-5.10.0/po/sr/kconfig5_qt.po 2015-05-03 17:06:01.000000000 +0200 +++ new/kconfig-5.11.0/po/sr/kconfig5_qt.po 2015-06-06 23:10:11.000000000 +0200 @@ -426,17 +426,17 @@ msgid "About KDE" msgstr "О КДЕ‑у" -#: kconf_update/kconf_update.cpp:947 +#: kconf_update/kconf_update.cpp:948 msgctxt "main|" msgid "KDE Tool for updating user configuration files" msgstr "КДЕ‑ова алатка за ажурирање корисничких поставних фајлова" -#: kconf_update/kconf_update.cpp:949 +#: kconf_update/kconf_update.cpp:950 msgctxt "main|" msgid "Keep output results from scripts" msgstr "Задржи излазне резултате из скрипти" -#: kconf_update/kconf_update.cpp:950 +#: kconf_update/kconf_update.cpp:951 msgctxt "main|" msgid "Check whether config file itself requires updating" msgstr "Провери да ли са̑м поставни фајл захтева ажурирање" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.10.0/po/sr@ijekavian/kconfig5_qt.po new/kconfig-5.11.0/po/sr@ijekavian/kconfig5_qt.po --- old/kconfig-5.10.0/po/sr@ijekavian/kconfig5_qt.po 2015-05-03 17:06:01.000000000 +0200 +++ new/kconfig-5.11.0/po/sr@ijekavian/kconfig5_qt.po 2015-06-06 23:10:11.000000000 +0200 @@ -426,17 +426,17 @@ msgid "About KDE" msgstr "О КДЕ‑у" -#: kconf_update/kconf_update.cpp:947 +#: kconf_update/kconf_update.cpp:948 msgctxt "main|" msgid "KDE Tool for updating user configuration files" msgstr "КДЕ‑ова алатка за ажурирање корисничких поставних фајлова" -#: kconf_update/kconf_update.cpp:949 +#: kconf_update/kconf_update.cpp:950 msgctxt "main|" msgid "Keep output results from scripts" msgstr "Задржи излазне резултате из скрипти" -#: kconf_update/kconf_update.cpp:950 +#: kconf_update/kconf_update.cpp:951 msgctxt "main|" msgid "Check whether config file itself requires updating" msgstr "Провјери да ли са̑м поставни фајл захтијева ажурирање" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.10.0/po/sr@ijekavianlatin/kconfig5_qt.po new/kconfig-5.11.0/po/sr@ijekavianlatin/kconfig5_qt.po --- old/kconfig-5.10.0/po/sr@ijekavianlatin/kconfig5_qt.po 2015-05-03 17:06:01.000000000 +0200 +++ new/kconfig-5.11.0/po/sr@ijekavianlatin/kconfig5_qt.po 2015-06-06 23:10:11.000000000 +0200 @@ -426,17 +426,17 @@ msgid "About KDE" msgstr "O KDE‑u" -#: kconf_update/kconf_update.cpp:947 +#: kconf_update/kconf_update.cpp:948 msgctxt "main|" msgid "KDE Tool for updating user configuration files" msgstr "KDE‑ova alatka za ažuriranje korisničkih postavnih fajlova" -#: kconf_update/kconf_update.cpp:949 +#: kconf_update/kconf_update.cpp:950 msgctxt "main|" msgid "Keep output results from scripts" msgstr "Zadrži izlazne rezultate iz skripti" -#: kconf_update/kconf_update.cpp:950 +#: kconf_update/kconf_update.cpp:951 msgctxt "main|" msgid "Check whether config file itself requires updating" msgstr "Provjeri da li sȃ̑m postavni fajl zahtijeva ažuriranje" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.10.0/po/sr@latin/kconfig5_qt.po new/kconfig-5.11.0/po/sr@latin/kconfig5_qt.po --- old/kconfig-5.10.0/po/sr@latin/kconfig5_qt.po 2015-05-03 17:06:01.000000000 +0200 +++ new/kconfig-5.11.0/po/sr@latin/kconfig5_qt.po 2015-06-06 23:10:11.000000000 +0200 @@ -426,17 +426,17 @@ msgid "About KDE" msgstr "O KDE‑u" -#: kconf_update/kconf_update.cpp:947 +#: kconf_update/kconf_update.cpp:948 msgctxt "main|" msgid "KDE Tool for updating user configuration files" msgstr "KDE‑ova alatka za ažuriranje korisničkih postavnih fajlova" -#: kconf_update/kconf_update.cpp:949 +#: kconf_update/kconf_update.cpp:950 msgctxt "main|" msgid "Keep output results from scripts" msgstr "Zadrži izlazne rezultate iz skripti" -#: kconf_update/kconf_update.cpp:950 +#: kconf_update/kconf_update.cpp:951 msgctxt "main|" msgid "Check whether config file itself requires updating" msgstr "Proveri da li sȃ̑m postavni fajl zahteva ažuriranje" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.10.0/src/gui/kconfiggui.cpp new/kconfig-5.11.0/src/gui/kconfiggui.cpp --- old/kconfig-5.10.0/src/gui/kconfiggui.cpp 2015-05-03 17:06:01.000000000 +0200 +++ new/kconfig-5.11.0/src/gui/kconfiggui.cpp 2015-06-06 23:10:11.000000000 +0200 @@ -25,28 +25,51 @@ #include <kconfig.h> +static QString configName(const QString &id, const QString &key) +{ + return(QLatin1String("session/") + QGuiApplication::applicationName() + + QLatin1Char('_') + id + + QLatin1Char('_') + key); +} + static KConfig *s_sessionConfig = Q_NULLPTR; KConfig *KConfigGui::sessionConfig() { - if (!s_sessionConfig) { // create an instance specific config object - s_sessionConfig = new KConfig(sessionConfigName(), KConfig::SimpleConfig); +#ifdef QT_NO_SESSIONMANAGER +#error QT_NO_SESSIONMANAGER was set, this will not compile. Reconfigure Qt with Session management support. +#endif + if (!hasSessionConfig()) { + // create the default instance specific config object + // from applications' -session command line parameter + s_sessionConfig = new KConfig(configName(qApp->sessionId(), + qApp->sessionKey()), + KConfig::SimpleConfig); } + return s_sessionConfig; } +void KConfigGui::setSessionConfig(const QString &id, const QString &key) +{ + if (hasSessionConfig()) { + delete s_sessionConfig; + s_sessionConfig = Q_NULLPTR; + } + + // create a new instance specific config object from supplied id & key + s_sessionConfig = new KConfig(configName(id, key), + KConfig::SimpleConfig); +} + bool KConfigGui::hasSessionConfig() { return s_sessionConfig != Q_NULLPTR; } +#ifndef KDE_NO_DEPRECATED QString KConfigGui::sessionConfigName() { -#ifdef QT_NO_SESSIONMANAGER -#error QT_NO_SESSIONMANAGER was set, this will not compile. Reconfigure Qt with Session management support. -#endif - const QString sessionKey = qApp->sessionKey(); - const QString sessionId = qApp->sessionId(); - return QString(QLatin1String("session/%1_%2_%3")).arg(QGuiApplication::applicationName()).arg(sessionId).arg(sessionKey); + return sessionConfig()->name(); } - +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.10.0/src/gui/kconfiggui.h new/kconfig-5.11.0/src/gui/kconfiggui.h --- old/kconfig-5.10.0/src/gui/kconfiggui.h 2015-05-03 17:06:01.000000000 +0200 +++ new/kconfig-5.11.0/src/gui/kconfiggui.h 2015-06-06 23:10:11.000000000 +0200 @@ -31,7 +31,7 @@ namespace KConfigGui { /** - * Returns the application session config object. + * Returns the current application session config object. * * @return A pointer to the application's instance specific * KConfig object. @@ -40,6 +40,16 @@ KCONFIGGUI_EXPORT KConfig *sessionConfig(); /** + * Replaces the current application session config object. + * + * @param id new session id + * @param key new session key + * + * @since 5.11 + */ +KCONFIGGUI_EXPORT void setSessionConfig(const QString &id, const QString &key); + +/** * Indicates if a session config has been created for that application * (ie. if sessionConfig() got called at least once) * @@ -51,8 +61,11 @@ * Returns the name of the application session * * @return the application session name + * @deprecated since 5.11, use sessionConfig()->name() */ -KCONFIGGUI_EXPORT QString sessionConfigName(); +#ifndef KDE_NO_DEPRECATED +KCONFIGGUI_DEPRECATED_EXPORT QString sessionConfigName(); +#endif } #endif // KCONFIGGUI_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.10.0/src/gui/kwindowconfig.cpp new/kconfig-5.11.0/src/gui/kwindowconfig.cpp --- old/kconfig-5.10.0/src/gui/kwindowconfig.cpp 2015-05-03 17:06:01.000000000 +0200 +++ new/kconfig-5.11.0/src/gui/kwindowconfig.cpp 2015-06-06 23:10:11.000000000 +0200 @@ -29,7 +29,8 @@ void KWindowConfig::saveWindowSize(const QWindow *window, KConfigGroup &config, KConfigGroup::WriteConfigFlags options) { - if (!window) { + // QWindow::screen() shouldn't return null, but it sometimes does due to bugs. + if (!window || !window->screen()) { return; } const QRect desk = window->screen()->geometry();
