Hello community, here is the log from the commit of package kdelibs4support for openSUSE:Factory checked in at 2015-09-02 07:44:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdelibs4support (Old) and /work/SRC/openSUSE:Factory/.kdelibs4support.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdelibs4support" Changes: -------- --- /work/SRC/openSUSE:Factory/kdelibs4support/kdelibs4support.changes 2015-07-14 17:23:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdelibs4support.new/kdelibs4support.changes 2015-09-02 07:45:00.000000000 +0200 @@ -1,0 +2,15 @@ +Tue Aug 4 19:20:21 UTC 2015 - [email protected] + +- Update to 5.13.0 + * The Qt version requirement has been bumped from 5.2 to 5.3 + * Debug output has been ported to categorized output, for less + noise by default + * Docbook documentation has been reviewed and updated + * kconfig_compiler_kf5 moved to libexec, use kreadconfig5 instead + for the findExe test + * Document the (suboptimal) replacements for + KApplication::disableSessionManagement + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.13.0.php + +------------------------------------------------------------------- Old: ---- kdelibs4support-5.12.0.tar.xz New: ---- kdelibs4support-5.13.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4support.spec ++++++ --- /var/tmp/diff_new_pack.0B2Nqt/_old 2015-09-02 07:45:01.000000000 +0200 +++ /var/tmp/diff_new_pack.0B2Nqt/_new 2015-09-02 07:45:01.000000000 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5KDELibs4Support5 -%define _tar_path 5.12 +%define _tar_path 5.13 Name: kdelibs4support -Version: 5.12.0 +Version: 5.13.0 Release: 0 %define kf5_version %{version} BuildRequires: NetworkManager-devel @@ -51,16 +51,16 @@ BuildRequires: kwindowsystem-devel >= %{_tar_path} BuildRequires: kxmlgui-devel >= %{_tar_path} BuildRequires: perl-URI -BuildRequires: pkgconfig(Qt5Concurrent) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 -BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Designer) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Network) >= 5.2.0 -BuildRequires: pkgconfig(Qt5PrintSupport) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Svg) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 -BuildRequires: pkgconfig(Qt5X11Extras) >= 5.2.0 +BuildRequires: cmake(Qt5Concurrent) >= 5.3.0 +BuildRequires: cmake(Qt5Core) >= 5.3.0 +BuildRequires: cmake(Qt5DBus) >= 5.3.0 +BuildRequires: cmake(Qt5Designer) >= 5.3.0 +BuildRequires: cmake(Qt5Network) >= 5.3.0 +BuildRequires: cmake(Qt5PrintSupport) >= 5.3.0 +BuildRequires: cmake(Qt5Svg) >= 5.3.0 +BuildRequires: cmake(Qt5Test) >= 5.3.0 +BuildRequires: cmake(Qt5Widgets) >= 5.3.0 +BuildRequires: cmake(Qt5X11Extras) >= 5.3.0 BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(x11) @@ -163,10 +163,10 @@ Requires: ktextwidgets-devel >= %{_tar_path} Requires: kunitconversion-devel >= %{_tar_path} Requires: kwindowsystem-devel >= %{_tar_path} -Requires: pkgconfig(Qt5Core) >= 5.2.0 -Requires: pkgconfig(Qt5DBus) >= 5.2.0 -Requires: pkgconfig(Qt5PrintSupport) >= 5.2.0 -Requires: pkgconfig(Qt5Xml) >= 5.2.0 +Requires: cmake(Qt5Core) >= 5.3.0 +Requires: cmake(Qt5DBus) >= 5.3.0 +Requires: cmake(Qt5PrintSupport) >= 5.3.0 +Requires: cmake(Qt5Xml) >= 5.3.0 %description devel This package includes CMake macros and C++ ++++++ kdelibs4support-5.12.0.tar.xz -> kdelibs4support-5.13.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/CMakeLists.txt new/kdelibs4support-5.13.0/CMakeLists.txt --- old/kdelibs4support-5.12.0/CMakeLists.txt 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/CMakeLists.txt 2015-08-04 12:52:18.000000000 +0200 @@ -3,7 +3,7 @@ project(KDELibs4Support) include(FeatureSummary) -find_package(ECM 5.12.0 NO_MODULE) +find_package(ECM 5.13.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) @@ -17,9 +17,9 @@ include(GenerateExportHeader) include(CMakeFindFrameworks) -set(KF5_VERSION "5.12.0") # handled by release scripts -set(KF5_DEP_VERSION "5.12.0") # handled by release scripts -set(REQUIRED_QT_VERSION 5.2.0) +set(KF5_VERSION "5.13.0") # handled by release scripts +set(KF5_DEP_VERSION "5.13.0") # handled by release scripts +set(REQUIRED_QT_VERSION 5.3.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport Designer) find_package(KF5Completion ${KF5_DEP_VERSION} REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/README.md new/kdelibs4support-5.13.0/README.md --- old/kdelibs4support-5.12.0/README.md 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/README.md 2015-08-04 12:52:18.000000000 +0200 @@ -1,5 +1,7 @@ # KDELibs 4 Support +Legacy support for kdelibs 4 compatibility + ## Introduction This framework provides code and utilities to ease the transition from diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/autotests/kstandarddirstest.cpp new/kdelibs4support-5.13.0/autotests/kstandarddirstest.cpp --- old/kdelibs4support-5.12.0/autotests/kstandarddirstest.cpp 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/autotests/kstandarddirstest.cpp 2015-08-04 12:52:18.000000000 +0200 @@ -308,15 +308,16 @@ QSKIP("KDEDIRS does not contain the KConfig prefix"); } + const QString exeFileName = QStringLiteral("kreadconfig5"); + // findExe with a result in bin - const QString binexe = KGlobal::dirs()->findExe("kconfig_compiler_kf5"); + const QString binexe = KGlobal::dirs()->findExe(exeFileName); QVERIFY(!binexe.isEmpty()); - QCOMPARE_PATHS(KCONFIG_COMPILER_LOCATION, binexe); + QCOMPARE_PATHS(binexe, QStandardPaths::findExecutable(exeFileName)); -#ifndef Q_OS_MAC // kconfig_compiler_kf5 is a bundle on Mac, so the below doesn't work // Check the "exe" resource too QString binexePath1 = KStandardDirs::realFilePath(binexe); - QString binexePath2 = KGlobal::dirs()->locate("exe", "kconfig_compiler_kf5"); + QString binexePath2 = KGlobal::dirs()->locate("exe", exeFileName); QCOMPARE_PATHS(binexePath1, binexePath2); // Check realFilePath behavior with complete command lines, like KRun does @@ -325,7 +326,6 @@ QCOMPARE(fromKStdDirs, cmd); const QString fromQFileInfo = QFileInfo(cmd).canonicalFilePath(); QVERIFY(fromQFileInfo.isEmpty()); // !! different result, since this doesn't exist as a file -#endif #ifdef Q_OS_UNIX // findExe with relative path diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/data/currency/adf.desktop new/kdelibs4support-5.13.0/data/currency/adf.desktop --- old/kdelibs4support-5.12.0/data/currency/adf.desktop 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/data/currency/adf.desktop 2015-08-04 12:52:18.000000000 +0200 @@ -4,6 +4,7 @@ #Context for Name: Adjectival Country Name and Currency Name Name=Andorran Franc Name[ar]=الفرنك الأندوري +Name[ast]=Francu andorranu Name[bs]=Andorski franak Name[ca]=Franc andorrà Name[cs]=Andorský frank diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/data/currency/adp.desktop new/kdelibs4support-5.13.0/data/currency/adp.desktop --- old/kdelibs4support-5.12.0/data/currency/adp.desktop 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/data/currency/adp.desktop 2015-08-04 12:52:18.000000000 +0200 @@ -4,6 +4,7 @@ #Context for Name: Adjectival Country Name and Currency Name Name=Andorran Peseta Name[ar]=البيزيتا الأندوري +Name[ast]=Peseta andorrana Name[bs]=Andorska pezeta Name[ca]=Pesseta andorrana Name[cs]=Andorská peseta diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/data/currency/crc.desktop new/kdelibs4support-5.13.0/data/currency/crc.desktop --- old/kdelibs4support-5.12.0/data/currency/crc.desktop 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/data/currency/crc.desktop 2015-08-04 12:52:18.000000000 +0200 @@ -30,7 +30,7 @@ Name[pa]=ਕੋਸਟਾ ਰੀਕਾ ਕੋਲੋਨ Name[pl]=Colon kostarykański Name[pt]=Colombo da Costa Rica -Name[pt_BR]=Colón costarriquenho +Name[pt_BR]=Colón costa-riquenho Name[ru]=Костариканский колон Name[sk]=Kostarický colón Name[sl]=kostariški kolon diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/data/currency/egp.desktop new/kdelibs4support-5.13.0/data/currency/egp.desktop --- old/kdelibs4support-5.12.0/data/currency/egp.desktop 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/data/currency/egp.desktop 2015-08-04 12:52:18.000000000 +0200 @@ -4,6 +4,7 @@ #Context for Name: Adjectival Country Name and Currency Name Name=Egyptian Pound Name[ar]=الجنيه المصري +Name[ast]=Llibra exipcia Name[bg]=Египетска лира Name[bn]=মিশরীয় পাউন্ড Name[bs]=egipatska funta diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/data/currency/esp.desktop new/kdelibs4support-5.13.0/data/currency/esp.desktop --- old/kdelibs4support-5.12.0/data/currency/esp.desktop 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/data/currency/esp.desktop 2015-08-04 12:52:18.000000000 +0200 @@ -4,6 +4,7 @@ #Context for Name: Adjectival Country Name and Currency Name Name=Spanish Peseta Name[ar]=البيزيتا الإسبانية +Name[ast]=Peseta española Name[bs]=španska pezeta Name[ca]=Pesseta espanyola Name[cs]=Španělská peseta diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/data/currency/eur.desktop new/kdelibs4support-5.13.0/data/currency/eur.desktop --- old/kdelibs4support-5.12.0/data/currency/eur.desktop 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/data/currency/eur.desktop 2015-08-04 12:52:18.000000000 +0200 @@ -5,6 +5,7 @@ #Context for Name: Adjectival Country Name and Currency Name Name=Euro Name[ar]=اليورو +Name[ast]=Euru Name[bg]=Евро Name[bn]=ইউরো Name[bs]=evro diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/data/currency/frf.desktop new/kdelibs4support-5.13.0/data/currency/frf.desktop --- old/kdelibs4support-5.12.0/data/currency/frf.desktop 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/data/currency/frf.desktop 2015-08-04 12:52:18.000000000 +0200 @@ -4,6 +4,7 @@ #Context for Name: Adjectival Country Name and Currency Name Name=French Franc Name[ar]=الفرنك الفرنسي +Name[ast]=Francu francés Name[bs]=francuski franak Name[ca]=Franc francès Name[cs]=Francouzský frank diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/data/currency/gbp.desktop new/kdelibs4support-5.13.0/data/currency/gbp.desktop --- old/kdelibs4support-5.12.0/data/currency/gbp.desktop 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/data/currency/gbp.desktop 2015-08-04 12:52:18.000000000 +0200 @@ -4,6 +4,7 @@ #Context for Name: Adjectival Country Name and Currency Name Name=British Pound Sterling Name[ar]=جنيه إسترليني بريطاني +Name[ast]=Llibra esterlina británica Name[bg]=Британска лира Name[bn]=বৃটিশ পাউন্ড স্টারলিং Name[bs]=britanska funta sterlinga diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/data/currency/sll.desktop new/kdelibs4support-5.13.0/data/currency/sll.desktop --- old/kdelibs4support-5.12.0/data/currency/sll.desktop 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/data/currency/sll.desktop 2015-08-04 12:52:18.000000000 +0200 @@ -30,7 +30,7 @@ Name[pa]=ਸਿਆਰਾ ਲਿਓਨ Name[pl]=Leone Sierra Leone Name[pt]=Leone da Serra Leoa -Name[pt_BR]=Leone serra-leonino +Name[pt_BR]=Leone serra-leonense Name[ru]=Леоне Сьерра-Леоне Name[sk]=Sierraleonské leone Name[sl]=leone Sierre Leone diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/data/currency/uzs.desktop new/kdelibs4support-5.13.0/data/currency/uzs.desktop --- old/kdelibs4support-5.12.0/data/currency/uzs.desktop 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/data/currency/uzs.desktop 2015-08-04 12:52:18.000000000 +0200 @@ -30,7 +30,7 @@ Name[pa]=ਉਜ਼ੇਬਕਸਤਾਨ ਸੋਮ Name[pl]=Som uzbecki Name[pt]=Som do Uzbequistão -Name[pt_BR]=Som usbeque +Name[pt_BR]=Som uzbeque Name[ru]=Узбекский сум Name[sk]=Uzbecký sum Name[sl]=uzbekistanski sum diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/data/currency/veb.desktop new/kdelibs4support-5.13.0/data/currency/veb.desktop --- old/kdelibs4support-5.12.0/data/currency/veb.desktop 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/data/currency/veb.desktop 2015-08-04 12:52:18.000000000 +0200 @@ -47,7 +47,7 @@ Name[pa]=ਵੈਨਜੂਵੇਲਾ ਬੋਲਵਿਰਾ ਫੁਰਟੀ Name[pl]=Wenezuelski Bolivar Fuerte Name[pt]=Bolivar Forte Venezuelano -Name[pt_BR]=Bolivar forte venezuelano +Name[pt_BR]=Bolívar forte venezuelano Name[ro]=Bolivar Fuerte Venezuela Name[ru]=Венесуэльский боливар Name[si]=වෙනිසියුලානු බොලිවාර් ෆයුර්ටෙ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/docs/kdebugdialog5/index.docbook new/kdelibs4support-5.13.0/docs/kdebugdialog5/index.docbook --- old/kdelibs4support-5.12.0/docs/kdebugdialog5/index.docbook 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/docs/kdebugdialog5/index.docbook 2015-08-04 12:52:18.000000000 +0200 @@ -17,8 +17,8 @@ <!-- TRANS:ROLES_OF_TRANSLATORS --> </authorgroup> -<date>2011-12-20</date> -<releaseinfo>1.0 &kde; 4.8</releaseinfo> +<date>2015-07-31</date> +<releaseinfo>Frameworks 5.13</releaseinfo> <keywordset> <keyword>KDE</keyword> @@ -33,6 +33,15 @@ <para>In order to be able to make changes <guilabel>Disable all debug output</guilabel> has to be unchecked.</para> +<note> +<para>Only for applications using the Frameworks library kdelibs4support.</para> +<para>kDebug() has been deprecated in &kde; Frameworks 5, in favour of &Qt;'s builtin categorized +logging, see<ulink url="http://doc.qt.io/qt-5/qloggingcategory.html";>QLoggingCategory</ulink>. +Use the program <ulink url="https://projects.kde.org/projects/kde/kdeutils/kdebugsettings";>kdebugsettings</ulink> +to enable/disable qCDebug. +</para> +</note> + <variablelist> <varlistentry> <term>Simple mode</term> @@ -115,7 +124,8 @@ <para>When you close the dialog by pressing <guibutton>OK</guibutton>, your entries apply immediately and are saved in -<filename>$<envar>KDEHOME</envar>/share/config/kdebugrc</filename>. When you press +<filename>$<envar>XDG_CONFIG_HOME</envar>/kdebugrc</filename> +(~/.config/kdebugrc by default). When you press <guibutton>Cancel</guibutton>, your entries are discarded and the old ones are restored.</para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/docs/kf5-config/man-kf5-config.1.docbook new/kdelibs4support-5.13.0/docs/kf5-config/man-kf5-config.1.docbook --- old/kdelibs4support-5.12.0/docs/kf5-config/man-kf5-config.1.docbook 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/docs/kf5-config/man-kf5-config.1.docbook 2015-08-04 12:52:18.000000000 +0200 @@ -5,14 +5,15 @@ <refentry lang="&language;"> <refentryinfo> -<title>&kde; User's Manual</title> +<title>kf5-config User's Manual</title> <author> <firstname>Stephan</firstname> <surname>Kulow</surname> <affiliation><address><email>[email protected]</email></address></affiliation> </author> -<date>2007-09-28</date> -<productname>K Desktop Environment</productname> +<date>2015-07-31</date> +<releaseinfo>Frameworks 5.13</releaseinfo> +<productname>KDE Frameworks</productname> </refentryinfo> <refmeta> @@ -22,7 +23,7 @@ <refnamediv> <refname><command>kf5-config</command></refname> -<refpurpose>Prints &kde; installation paths</refpurpose> +<refpurpose>Prints &Qt; and Frameworks installation paths</refpurpose> </refnamediv> <refsynopsisdiv> @@ -34,22 +35,31 @@ <arg>--libsuffix</arg> <arg>--localprefix</arg> <arg>--version</arg> +<arg>--kde-version</arg> <arg>--types</arg> <arg>--path <replaceable>type</replaceable></arg> <arg>--userpath <replaceable>type</replaceable></arg> <arg>--install <replaceable>type</replaceable></arg> +<arg>--qt-prefix</arg> +<arg>--qt-binaries</arg> +<arg>--qt-libraries</arg> +<arg>--qt-plugins</arg> + </cmdsynopsis> </refsynopsisdiv> <refsect1> <title>Description</title> <para>kf5-config is a command line program used to retrieve information -about &kde; installation or user paths.</para> +about Frameworks installation or user paths.</para> -<para>Use this program to determine where the various aspects of the &kde; +<para>Use this program to determine where the various aspects of the Frameworks installation reside on your system. </para> +<note><para>kf5-config is mostly a deprecated replacement for kde4-config, while the +recommended tool to use instead is qtpaths (which is shipped with &Qt;). +</para></note> </refsect1> <refsect1> @@ -66,14 +76,14 @@ <varlistentry> <term><option>--prefix</option></term> <listitem> -<para>Compiled in prefix for &kde; libraries</para> +<para>Compiled in prefix for Frameworks libraries</para> </listitem> </varlistentry> <varlistentry> <term><option>--exec-prefix</option></term> <listitem> -<para>Compiled in exec_prefix for &kde; libraries</para> +<para>Compiled in exec_prefix for Frameworks libraries</para> </listitem> </varlistentry> @@ -94,7 +104,14 @@ <varlistentry> <term><option>--version</option></term> <listitem> -<para>Compiled in version string for &kde; libraries</para> +<para>Version of &Qt; and compiled in version string for Frameworks libraries and kf5-config</para> +</listitem> +</varlistentry> + +<varlistentry> +<term><option>--kde-version</option></term> +<listitem> +<para>Compiled in version string for Frameworks libraries</para> </listitem> </varlistentry> @@ -115,7 +132,7 @@ <varlistentry> <term><option>--userpath <replaceable>type</replaceable></option></term> <listitem> -<para>User paths for the types: desktop|autostart|trash|document</para> +<para>User paths for the types: desktop|document</para> </listitem> </varlistentry> @@ -126,13 +143,41 @@ </listitem> </varlistentry> +<varlistentry> +<term><option>--qt-prefix</option></term> +<listitem> +<para>Installation prefix for &Qt;</para> +</listitem> +</varlistentry> + +<varlistentry> +<term><option>--qt-binaries</option></term> +<listitem> +<para>Location of installed &Qt; binaries</para> +</listitem> +</varlistentry> + +<varlistentry> +<term><option>--qt-libraries</option></term> +<listitem> +<para>Location of installed &Qt; libraries</para> +</listitem> +</varlistentry> + +<varlistentry> +<term><option>--qt-plugins</option></term> +<listitem> +<para>Location of installed &Qt; plugins</para> +</listitem> +</varlistentry> + </variablelist> </refsect1> <refsect1> <title>Examples</title> -<para>Print the top-level &kde; installation directory:</para> +<para>Print the top-level Frameworks installation directory:</para> <para> <prompt>%</prompt><userinput> <command>kf5-config --prefix</command> </userinput> @@ -156,7 +201,7 @@ <refsect1> <title>See Also</title> -<para>kdeoptions(7)</para> +<para>kf5options(7)</para> </refsect1> <refsect1> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/po/de/docs/kdebugdialog5/index.docbook new/kdelibs4support-5.13.0/po/de/docs/kdebugdialog5/index.docbook --- old/kdelibs4support-5.12.0/po/de/docs/kdebugdialog5/index.docbook 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/po/de/docs/kdebugdialog5/index.docbook 2015-08-04 12:52:18.000000000 +0200 @@ -51,9 +51,9 @@ </authorgroup> <date ->2011-12-20</date> +>2015-07-31</date> <releaseinfo ->1.0 &kde; 4.8</releaseinfo> +>Frameworks 5.13</releaseinfo> <keywordset> <keyword @@ -73,6 +73,17 @@ >Sämtliche Debug-Ausgaben deaktivieren</guilabel > abgewählt werden.</para> +<note> +<para +>Only for applications using the Frameworks library kdelibs4support.</para> +<para +>kDebug() has been deprecated in &kde; Frameworks 5, in favour of &Qt;'s builtin categorized logging, see<ulink url="http://doc.qt.io/qt-5/qloggingcategory.html"; +>QLoggingCategory</ulink +>. Use the program <ulink url="https://projects.kde.org/projects/kde/kdeutils/kdebugsettings"; +>kdebugsettings</ulink +> to enable/disable qCDebug. </para> +</note> + <variablelist> <varlistentry> <term @@ -200,15 +211,15 @@ </variablelist> <para ->Beenden Sie das Dialogfenster durch Anklicken von <guibutton +>When you close the dialog by pressing <guibutton >OK</guibutton ->, werden Ihre Änderungen sofort wirksam und in der Datei <filename +>, your entries apply immediately and are saved in <filename >$<envar ->KDEHOME</envar ->/share/config/kdebugrc</filename -> gespeichert. Klicken Sie auf <guibutton ->Abbrechen</guibutton ->, werden Ihre Änderungen vollständig verworfen und die ursprünglichen Einstellungen wiederhergestellt.</para> +>XDG_CONFIG_HOME</envar +>/kdebugrc</filename +> (~/.config/kdebugrc by default). When you press <guibutton +>Cancel</guibutton +>, your entries are discarded and the old ones are restored.</para> <para >Dank geht an Kalle Dalheimer für die Orginalversion von &kdebugdialog;</para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/po/de/docs/kf5-config/man-kf5-config.1.docbook new/kdelibs4support-5.13.0/po/de/docs/kf5-config/man-kf5-config.1.docbook --- old/kdelibs4support-5.12.0/po/de/docs/kf5-config/man-kf5-config.1.docbook 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/po/de/docs/kf5-config/man-kf5-config.1.docbook 2015-08-04 12:52:18.000000000 +0200 @@ -6,7 +6,7 @@ <refentry lang="&language;"> <refentryinfo> <title ->&kde;-Benutzerhandbuch</title> +>kf5-config User's Manual</title> <author ><firstname >Stephan</firstname @@ -20,9 +20,11 @@ ></affiliation> </author> <date ->2007-09-28</date> +>2015-07-31</date> +<releaseinfo +>Frameworks 5.13</releaseinfo> <productname ->K Desktop Environment</productname> +>KDE Frameworks</productname> </refentryinfo> <refmeta> @@ -40,7 +42,7 @@ >kf5-config</command ></refname> <refpurpose ->Gibt die Installationspfade von &kde; aus</refpurpose> +>Prints &Qt; and Frameworks installation paths</refpurpose> </refnamediv> <refsynopsisdiv> @@ -60,6 +62,8 @@ > <arg >--version</arg > <arg +>--kde-version</arg +> <arg >--types</arg > <arg >--path <replaceable @@ -73,6 +77,14 @@ >--install <replaceable >type</replaceable ></arg +> <arg +>--qt-prefix</arg +> <arg +>--qt-binaries</arg +> <arg +>--qt-libraries</arg +> <arg +>--qt-plugins</arg > </cmdsynopsis> </refsynopsisdiv> @@ -80,12 +92,16 @@ <title >Beschreibung</title> <para ->kf5-config ist Befehlszeilenprogramm, mit dem Informationen über die &kde;-Installation oder Benutzerpfade abgerufen werden können.</para> +>kf5-config is a command line program used to retrieve information about Frameworks installation or user paths.</para> <para ->Verwenden Sie dieses Programm zur Abfrage der verschiedenen Aspekte der auf Ihrem System vorliegenden &kde;-Installation. </para +>Use this program to determine where the various aspects of the Frameworks installation reside on your system. </para > +<note +><para +>kf5-config is mostly a deprecated replacement for kde4-config, while the recommended tool to use instead is qtpaths (which is shipped with &Qt;). </para +></note> </refsect1> <refsect1> @@ -111,7 +127,7 @@ ></term> <listitem> <para ->Einkompiliertes prefix für &kde;-Bibliotheken</para> +>Compiled in prefix for Frameworks libraries</para> </listitem> </varlistentry> @@ -122,7 +138,7 @@ ></term> <listitem> <para ->Einkompiliertes exec_prefix für &kde;-Bibliotheken</para> +>Compiled in exec_prefix for Frameworks libraries</para> </listitem> </varlistentry> @@ -159,7 +175,18 @@ ></term> <listitem> <para ->Einkompilierte Versionszeichenkette für &kde;-Bibliotheken</para> +>Version of &Qt; and compiled in version string for Frameworks libraries and kf5-config</para> +</listitem> +</varlistentry> + +<varlistentry> +<term +><option +>--kde-version</option +></term> +<listitem> +<para +>Compiled in version string for Frameworks libraries</para> </listitem> </varlistentry> @@ -198,7 +225,7 @@ ></term> <listitem> <para ->Benutzerpfade für die Typen: desktop|autostart|trash|document</para> +>User paths for the types: desktop|document</para> </listitem> </varlistentry> @@ -215,6 +242,50 @@ </listitem> </varlistentry> +<varlistentry> +<term +><option +>--qt-prefix</option +></term> +<listitem> +<para +>Installation prefix for &Qt;</para> +</listitem> +</varlistentry> + +<varlistentry> +<term +><option +>--qt-binaries</option +></term> +<listitem> +<para +>Location of installed &Qt; binaries</para> +</listitem> +</varlistentry> + +<varlistentry> +<term +><option +>--qt-libraries</option +></term> +<listitem> +<para +>Location of installed &Qt; libraries</para> +</listitem> +</varlistentry> + +<varlistentry> +<term +><option +>--qt-plugins</option +></term> +<listitem> +<para +>Location of installed &Qt; plugins</para> +</listitem> +</varlistentry> + </variablelist> </refsect1> @@ -223,7 +294,7 @@ >Beispiele</title> <para ->Ausgabe des Basisordners der &kde;-Installation:</para> +>Print the top-level Frameworks installation directory:</para> <para ><prompt >%</prompt @@ -263,7 +334,7 @@ <title >Siehe auch</title> <para ->kdeoptions(7)</para> +>kf5options(7)</para> </refsect1> <refsect1> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/po/de/kdelibs4support.po new/kdelibs4support-5.13.0/po/de/kdelibs4support.po --- old/kdelibs4support-5.12.0/po/de/kdelibs4support.po 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/po/de/kdelibs4support.po 2015-08-04 12:52:18.000000000 +0200 @@ -14,7 +14,7 @@ "Project-Id-Version: kdecalendarsystems\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-05-03 08:52+0000\n" -"PO-Revision-Date: 2015-03-09 21:29+0100\n" +"PO-Revision-Date: 2015-07-30 16:49+0200\n" "Last-Translator: Burkhard Lück <[email protected]>\n" "Language-Team: German <[email protected]>\n" "Language: de\n" @@ -5862,7 +5862,7 @@ #: kdecore/kcmdlineargs.cpp:278 msgid "Use the X-server display 'displayname'" -msgstr "X-Server-Darstellung namens „Anzeige“ benutzen" +msgstr "X-Server-Display namens „displayname“ benutzen" #: kdecore/kcmdlineargs.cpp:281 msgid "Restore the application for the given 'sessionId'" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/po/fi/kdelibs4support.po new/kdelibs4support-5.13.0/po/fi/kdelibs4support.po --- old/kdelibs4support-5.12.0/po/fi/kdelibs4support.po 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/po/fi/kdelibs4support.po 2015-08-04 12:52:18.000000000 +0200 @@ -29,7 +29,7 @@ "POT-Creation-Date: 2015-05-03 08:52+0000\n" "PO-Revision-Date: 2015-05-07 21:34+0200\n" "Last-Translator: Lasse Liehu <[email protected]>\n" -"Language-Team: Finnish <[email protected]>\n" +"Language-Team: Finnish <[email protected]>\n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/po/nl/docs/kdebugdialog5/index.docbook new/kdelibs4support-5.13.0/po/nl/docs/kdebugdialog5/index.docbook --- old/kdelibs4support-5.12.0/po/nl/docs/kdebugdialog5/index.docbook 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/po/nl/docs/kdebugdialog5/index.docbook 2015-08-04 12:52:18.000000000 +0200 @@ -23,9 +23,9 @@ </authorgroup> <date ->2011-12-20</date> +>2015-07-31</date> <releaseinfo ->1.0 &kde; 4.8</releaseinfo> +>Frameworks 5.13</releaseinfo> <keywordset> <keyword @@ -45,6 +45,17 @@ >Alle debuguitvoer uitschakelen</guilabel > zijn gedeactiveerd.</para> +<note> +<para +>Alleen voor toepassingen die de Frameworks bibliothek kdelibs4support gebruiken.</para> +<para +>kDebug() is achtergesteld in &kde; Frameworks 5, ten gunste van ingebouwde logging met categorieën van &Qt;, zie<ulink url="http://doc.qt.io/qt-5/qloggingcategory.html"; +>QLoggingCategory</ulink +>. Gebruik het programma <ulink url="https://projects.kde.org/projects/kde/kdeutils/kdebugsettings"; +>kdebugsettings</ulink +> om qCDebug in/uit te schakelen. </para> +</note> + <variablelist> <varlistentry> <term @@ -174,9 +185,9 @@ >OK</guibutton > sluit, worden uw instellingen onmiddellijk toegepast en opgeslagen in > <filename >$<envar ->KDEHOME</envar ->/share/config/kdebugrc</filename ->. Wanneer u op <guibutton +>XDG_CONFIG_HOME</envar +>/kdebugrc</filename +> (standaard ~/.config/kdebugrc). Wanneer u op <guibutton >Annuleren</guibutton > klikt, zullen uw instellingen niet opgeslagen worden.</para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/po/nl/docs/kf5-config/man-kf5-config.1.docbook new/kdelibs4support-5.13.0/po/nl/docs/kf5-config/man-kf5-config.1.docbook --- old/kdelibs4support-5.12.0/po/nl/docs/kf5-config/man-kf5-config.1.docbook 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/po/nl/docs/kf5-config/man-kf5-config.1.docbook 2015-08-04 12:52:18.000000000 +0200 @@ -6,7 +6,7 @@ <refentry lang="&language;"> <refentryinfo> <title ->&kde;-gebruikershandleiding</title> +>Gebruikershandleiding van kf5-config</title> <author ><firstname >Stephan</firstname @@ -20,9 +20,11 @@ ></affiliation> </author> <date ->2007-09-28</date> +>2015-07-31</date> +<releaseinfo +>Frameworks 5.13</releaseinfo> <productname ->K Desktop Environment</productname> +>KDE Frameworks</productname> </refentryinfo> <refmeta> @@ -40,7 +42,7 @@ >kf5-config</command ></refname> <refpurpose ->Toont de &kde; installatiepaden</refpurpose> +>Toont de installatiepaden van &Qt; en Frameworks</refpurpose> </refnamediv> <refsynopsisdiv> @@ -60,6 +62,8 @@ > <arg >--version</arg > <arg +>--kde-version</arg +> <arg >--types</arg > <arg >--path <replaceable @@ -73,6 +77,14 @@ >--install <replaceable >type</replaceable ></arg +> <arg +>--qt-prefix</arg +> <arg +>--qt-binaries</arg +> <arg +>--qt-libraries</arg +> <arg +>--qt-plugins</arg > </cmdsynopsis> </refsynopsisdiv> @@ -80,12 +92,16 @@ <title >Beschrijving</title> <para ->kf5-config is een commandoregelprogramma dat gebruikt wordt om informatie over de &kde; installatie of gebruikerspaden te verkrijgen.</para> +>kf5-config is een commandoregelprogramma dat gebruikt wordt om informatie over de Frameworks-installatie of gebruikerspaden te verkrijgen.</para> <para ->Gebruik dit programma om te bepalen waar de verschillende aspecten van de &kde;-installatie verblijven op uw systeem. </para +>Gebruik dit programma om te bepalen waar de verschillende aspecten van de Frameworks-installatie verblijven op uw systeem. </para > +<note +><para +>kf5-config is in hoofdzaak een achtergestelde vervanging voor kde4-config, terwijl het aanbevolen te gebruiken hulpmiddel qtpaths is (dat wordt meegeleverd met &Qt;). </para +></note> </refsect1> <refsect1> @@ -111,7 +127,7 @@ ></term> <listitem> <para ->Gecompileerd in prefix voor &kde;-bibliotheken</para> +>Gecompileerd in prefix voor Frameworks-bibliotheken</para> </listitem> </varlistentry> @@ -122,7 +138,7 @@ ></term> <listitem> <para ->Gecompileerd in exec_prefix voor &kde;-bibliotheken</para> +>Gecompileerd in exec_prefix voor Frameworks-bibliotheken</para> </listitem> </varlistentry> @@ -157,7 +173,18 @@ ></term> <listitem> <para ->Gecompileerd in version string voor &kde;-bibliotheken</para> +>Versie van &Qt; en ingecompileerde versietekst voor Frameworks bibliotheken en kf5-config</para> +</listitem> +</varlistentry> + +<varlistentry> +<term +><option +>--kde-version</option +></term> +<listitem> +<para +>Gecompileerd in versietekst voor Frameworks-bibliotheken</para> </listitem> </varlistentry> @@ -196,7 +223,7 @@ ></term> <listitem> <para ->Gebruikerspad voor de typen: desktop|autostart|document</para> +>Gebruikerspad voor de typen: desktop|document</para> </listitem> </varlistentry> @@ -213,6 +240,50 @@ </listitem> </varlistentry> +<varlistentry> +<term +><option +>--qt-prefix</option +></term> +<listitem> +<para +>Installatievoorvoegsel voor &Qt;</para> +</listitem> +</varlistentry> + +<varlistentry> +<term +><option +>--qt-binaries</option +></term> +<listitem> +<para +>Locatie van geïnstalleerde binaire &Qt;-programma's</para> +</listitem> +</varlistentry> + +<varlistentry> +<term +><option +>--qt-libraries</option +></term> +<listitem> +<para +>Locatie van de geïnstalleerde &Qt;-bibliotheken</para> +</listitem> +</varlistentry> + +<varlistentry> +<term +><option +>--qt-plugins</option +></term> +<listitem> +<para +>Locatie van de geïnstalleerde &Qt;-plugins</para> +</listitem> +</varlistentry> + </variablelist> </refsect1> @@ -221,7 +292,7 @@ >Voorbeelden</title> <para ->Toon de hoogste &kde;-installatiemap:</para> +>Toon de hoogste installatiemap van Frameworks:</para> <para ><prompt >%</prompt @@ -261,7 +332,7 @@ <title >Zie ook</title> <para ->kdeoptions(7)</para> +>kf5options(7)</para> </refsect1> <refsect1> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/po/pt_BR/kdelibs4support.po new/kdelibs4support-5.13.0/po/pt_BR/kdelibs4support.po --- old/kdelibs4support-5.12.0/po/pt_BR/kdelibs4support.po 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/po/pt_BR/kdelibs4support.po 2015-08-04 12:52:18.000000000 +0200 @@ -8,7 +8,7 @@ "Project-Id-Version: kdelibs4support\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-05-03 08:52+0000\n" -"PO-Revision-Date: 2015-01-25 08:03-0200\n" +"PO-Revision-Date: 2015-07-05 21:01-0300\n" "Last-Translator: André Marcelo Alvarenga <[email protected]>\n" "Language-Team: Brazilian Portuguese <[email protected]>\n" "Language: pt_BR\n" @@ -6760,7 +6760,7 @@ #: kdecore/TIMEZONES:68 msgid "America/Anguilla" -msgstr "América/Anguilla" +msgstr "América/Anguila" #: kdecore/TIMEZONES:69 msgid "America/Antigua" @@ -7470,7 +7470,7 @@ #: kdecore/TIMEZONES:316 msgid "America/Martinique" -msgstr "América/Martinique" +msgstr "América/Martinica" #: kdecore/TIMEZONES:317 msgid "America/Matamoros" @@ -9268,11 +9268,11 @@ #: kdecore/TIMEZONES:936 msgid "Indian/Maldives" -msgstr "Índia/Maldives" +msgstr "Índia/Maldivas" #: kdecore/TIMEZONES:937 msgid "Indian/Mauritius" -msgstr "Índia/Ilhas_Maurícios" +msgstr "Índia/Maurício" #: kdecore/TIMEZONES:938 msgid "Indian/Mayotte" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/po/sv/docs/kdebugdialog5/index.docbook new/kdelibs4support-5.13.0/po/sv/docs/kdebugdialog5/index.docbook --- old/kdelibs4support-5.12.0/po/sv/docs/kdebugdialog5/index.docbook 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/po/sv/docs/kdebugdialog5/index.docbook 2015-08-04 12:52:18.000000000 +0200 @@ -37,9 +37,9 @@ </authorgroup> <date ->2011-12-20</date> +>2015-07-31</date> <releaseinfo ->1.0 &kde; 4.8</releaseinfo> +>Ramverk 5.13</releaseinfo> <keywordset> <keyword @@ -59,6 +59,17 @@ >Inaktivera all felsökningsutmatning</guilabel > vara avmarkerat.</para> +<note> +<para +>Bara för program som använder ramverkets biblioteket kdelibs4support.</para> +<para +>Användning av kDebug() avråds från i &kde; Ramverk 5, som ersätts av &Qt;s inbyggda kategoriserade loggning, se <ulink url="http://doc.qt.io/qt-5/qloggingcategory.html"; +>QLoggingCategory</ulink +>. Använd programmet <ulink url="https://projects.kde.org/projects/kde/kdeutils/kdebugsettings"; +>kdebugsettings</ulink +> för att aktivera eller inaktivera qCDebug. </para> +</note> + <variablelist> <varlistentry> <term @@ -190,9 +201,9 @@ >Ok</guibutton >, börjar ändringarna gälla omedelbart, och sparas i <filename >$<envar ->KDEHOME</envar ->/share/config/kdebugrc</filename ->. Om du trycker på <guibutton +>XDG_CONFIG_HOME</envar +>/kdebugrc</filename +> (normalt ~/.config/kdebugrc). Om du trycker på <guibutton >Avbryt</guibutton >, så slängs dina ändringar och de tidigare återställs.</para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/po/sv/docs/kf5-config/man-kf5-config.1.docbook new/kdelibs4support-5.13.0/po/sv/docs/kf5-config/man-kf5-config.1.docbook --- old/kdelibs4support-5.12.0/po/sv/docs/kf5-config/man-kf5-config.1.docbook 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/po/sv/docs/kf5-config/man-kf5-config.1.docbook 2015-08-04 12:52:18.000000000 +0200 @@ -6,7 +6,7 @@ <refentry lang="&language;"> <refentryinfo> <title ->&kde; användarhandbok</title> +>kf5-config användarhandbok</title> <author ><firstname >Stephan</firstname @@ -20,9 +20,11 @@ ></affiliation> </author> <date ->2007-09-28</date> +>2015-07-31</date> +<releaseinfo +>Ramverk 5.13</releaseinfo> <productname ->K-skrivbordsmiljön</productname> +>KDE Ramverk</productname> </refentryinfo> <refmeta> @@ -40,7 +42,7 @@ >kf5-config</command ></refname> <refpurpose ->Skriver ut installationssökvägar för &kde;</refpurpose> +>Skriver ut installationssökvägar för &Qt; och ramverk</refpurpose> </refnamediv> <refsynopsisdiv> @@ -60,6 +62,8 @@ > <arg >--version</arg > <arg +>--kde-version</arg +> <arg >--types</arg > <arg >--path <replaceable @@ -73,6 +77,14 @@ >--install <replaceable >typ</replaceable ></arg +> <arg +>--qt-prefix</arg +> <arg +>--qt-binaries</arg +> <arg +>--qt-libraries</arg +> <arg +>--qt-plugins</arg > </cmdsynopsis> </refsynopsisdiv> @@ -80,12 +92,16 @@ <title >Beskrivning</title> <para ->kf5-config är ett kommandoradsprogram som används för att hämta information om &kde;:s installation eller användarsökvägar.</para> +>kf5-config är ett kommandoradsprogram som används för att hämta information om ramverkens installation eller användarsökvägar.</para> <para ->Använd programmet för att avgöra var de olika delarna av &kde;-installationen finns på ditt system. </para +>Använd programmet för att avgöra var de olika delarna av ramverksinstallationen finns på ditt system. </para > +<note +><para +>kf5-config är en ersättning för kde4-config vars användning i huvudsak avråds från, medan det rekommenderade verkyget att använda istället är qtpaths (som levereras med &Qt;). </para +></note> </refsect1> <refsect1> @@ -111,7 +127,7 @@ ></term> <listitem> <para ->Inkompilerat prefix för &kde;-bibliotek</para> +>Inkompilerat prefix för ramverksbibliotek</para> </listitem> </varlistentry> @@ -122,7 +138,7 @@ ></term> <listitem> <para ->Inkompilerat exec_prefix för &kde;-bibliotek</para> +>Inkompilerat exec_prefix för ramverksbibliotek</para> </listitem> </varlistentry> @@ -157,7 +173,18 @@ ></term> <listitem> <para ->Inkompilerad versionssträng för &kde;-bibliotek</para> +>Version av &Qt; och inkompilerad versionssträng för ramverksbibliotek och kf5-config</para> +</listitem> +</varlistentry> + +<varlistentry> +<term +><option +>--kde-version</option +></term> +<listitem> +<para +>Inkompilerad versionssträng för ramverksbibliotek.</para> </listitem> </varlistentry> @@ -196,7 +223,7 @@ ></term> <listitem> <para ->Användarsökvägar för typerna: desktop|autostart|trash|document</para> +>Användarsökvägar för typerna: desktop|document</para> </listitem> </varlistentry> @@ -213,6 +240,50 @@ </listitem> </varlistentry> +<varlistentry> +<term +><option +>--qt-prefix</option +></term> +<listitem> +<para +>Installationsprefix för &Qt;</para> +</listitem> +</varlistentry> + +<varlistentry> +<term +><option +>--qt-binaries</option +></term> +<listitem> +<para +>Plats för installerade &Qt;-binärfiler</para> +</listitem> +</varlistentry> + +<varlistentry> +<term +><option +>--qt-libraries</option +></term> +<listitem> +<para +>Plats för installerade &Qt;-bibliotek</para> +</listitem> +</varlistentry> + +<varlistentry> +<term +><option +>--qt-plugins</option +></term> +<listitem> +<para +>Plats för installerade &Qt;-insticksprogram</para> +</listitem> +</varlistentry> + </variablelist> </refsect1> @@ -221,7 +292,7 @@ >Exempel</title> <para ->Skriv ut &kde;:s toppnivå-installationskatalog:</para> +>Skriv ut ramverkens toppnivå-installationskatalog:</para> <para ><prompt >%</prompt @@ -261,7 +332,7 @@ <title >Se också</title> <para ->kdeoptions(7)</para> +>kf5options(7)</para> </refsect1> <refsect1> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/po/uk/docs/kdebugdialog5/index.docbook new/kdelibs4support-5.13.0/po/uk/docs/kdebugdialog5/index.docbook --- old/kdelibs4support-5.12.0/po/uk/docs/kdebugdialog5/index.docbook 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/po/uk/docs/kdebugdialog5/index.docbook 2015-08-04 12:52:18.000000000 +0200 @@ -37,9 +37,9 @@ </authorgroup> <date ->20 січня 2011 року</date> +>31 липня 2015 року</date> <releaseinfo ->1.0 &kde; 4.8</releaseinfo> +>Frameworks 5.13</releaseinfo> <keywordset> <keyword @@ -59,6 +59,17 @@ >Вимкнути всі повідомлення налагоджування</guilabel >.</para> +<note> +<para +>Лише для програм, де використовується бібліотека Frameworks kdelibs4support.</para> +<para +>kDebug() вважається застарілим у &kde; Frameworks 5. Замість нього використовується вбудоване до &Qt; категоризоване ведення журналу, див. <ulink url="http://doc.qt.io/qt-5/qloggingcategory.html"; +>QLoggingCategory</ulink +>. Для вмикання та вимикання qCDebug скористайтеся <ulink url="https://projects.kde.org/projects/kde/kdeutils/kdebugsettings"; +>kdebugsettings</ulink +>. </para> +</note> + <variablelist> <varlistentry> <term @@ -190,9 +201,9 @@ >Гаразд</guibutton >, вказані вами параметри буде негайно застосовано і збережено до файла ><filename >$<envar ->KDEHOME</envar ->/share/config/kdebugrc</filename ->. Якщо ви натиснете кнопку <guibutton +>XDG_CONFIG_HOME</envar +>/kdebugrc</filename +> (типово ~/.config/kdebugrc). Якщо ви натиснете кнопку <guibutton >Скасувати</guibutton >, вказані вами параметри буде скасовано і відновлено попередні >значення.</para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/po/uk/docs/kf5-config/man-kf5-config.1.docbook new/kdelibs4support-5.13.0/po/uk/docs/kf5-config/man-kf5-config.1.docbook --- old/kdelibs4support-5.12.0/po/uk/docs/kf5-config/man-kf5-config.1.docbook 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/po/uk/docs/kf5-config/man-kf5-config.1.docbook 2015-08-04 12:52:18.000000000 +0200 @@ -6,7 +6,7 @@ <refentry lang="&language;"> <refentryinfo> <title ->Інструкція користувача &kde;</title> +>Інструкція користувача kf5-config</title> <author ><firstname >Stephan</firstname @@ -20,9 +20,11 @@ ></affiliation> </author> <date ->28 вересня 2007 року</date> +>31 липня 2015 року</date> +<releaseinfo +>Frameworks 5.13</releaseinfo> <productname ->Стільничне середовище KDE</productname> +>KDE Frameworks</productname> </refentryinfo> <refmeta> @@ -40,7 +42,7 @@ >kf5-config</command ></refname> <refpurpose ->Виводить шляхи, куди встановлено &kde;</refpurpose> +>Вивести шляхи встановлення &Qt; та Frameworks.</refpurpose> </refnamediv> <refsynopsisdiv> @@ -60,6 +62,8 @@ > <arg >--version</arg > <arg +>--kde-version</arg +> <arg >--types</arg > <arg >--path <replaceable @@ -73,6 +77,14 @@ >--install <replaceable >тип</replaceable ></arg +> <arg +>--qt-prefix</arg +> <arg +>--qt-binaries</arg +> <arg +>--qt-libraries</arg +> <arg +>--qt-plugins</arg > </cmdsynopsis> </refsynopsisdiv> @@ -80,12 +92,16 @@ <title >Опис</title> <para ->kf5-config — це програма, яка працює у командному рядку і використовується для отримання інформації щодо шляхів встановлення &kde; і шляхів користувача &kde;.</para> +>kf5-config — це програма, яка працює у командному рядку і використовується для отримання інформації щодо шляхів встановлення &kde; і шляхів користувача Frameworks.</para> <para ->Користуйтесь цією програмою для визначення місць, де у вашій системі знаходяться різні частини встановленого &kde;. </para +>Користуйтесь цією програмою для визначення місць, де у вашій системі знаходяться різні частини встановленого Frameworks. </para > +<note +><para +>kf5-config — здебільшого застарілий замінник kde4-config, хоча і є рекомендованим інструментом-замінником qtpaths (ця програма є частиною &Qt;). </para +></note> </refsect1> <refsect1> @@ -111,7 +127,7 @@ ></term> <listitem> <para ->Префікс компіляції бібліотек &kde;</para> +>Вбудований префікс для бібліотек Frameworks.</para> </listitem> </varlistentry> @@ -122,7 +138,7 @@ ></term> <listitem> <para ->Префікс exec_prefix для бібліотек &kde;</para> +>Префікс exec_prefix для бібліотек Frameworks.</para> </listitem> </varlistentry> @@ -157,7 +173,18 @@ ></term> <listitem> <para ->Вставлений під час компіляції у бібліотеки рядок з версією &kde;</para> +>Версія &Qt; і вбудований рядок версії для бібліотек Frameworks і kf5-config.</para> +</listitem> +</varlistentry> + +<varlistentry> +<term +><option +>--kde-version</option +></term> +<listitem> +<para +>Вставлений під час компіляції у бібліотеки рядок з версією Frameworks.</para> </listitem> </varlistentry> @@ -196,7 +223,7 @@ ></term> <listitem> <para ->Шляхи користувача для типів: desktop|autostart|trash|document</para> +>Шляхи користувача для типів: desktop|document</para> </listitem> </varlistentry> @@ -213,6 +240,50 @@ </listitem> </varlistentry> +<varlistentry> +<term +><option +>--qt-prefix</option +></term> +<listitem> +<para +>Шлях до теки, де встановлено &Qt;.</para> +</listitem> +</varlistentry> + +<varlistentry> +<term +><option +>--qt-binaries</option +></term> +<listitem> +<para +>Адреса встановлених програм &Qt;.</para> +</listitem> +</varlistentry> + +<varlistentry> +<term +><option +>--qt-libraries</option +></term> +<listitem> +<para +>Адреса встановлених бібліотек &Qt;.</para> +</listitem> +</varlistentry> + +<varlistentry> +<term +><option +>--qt-plugins</option +></term> +<listitem> +<para +>Адреса встановлених додатків &Qt;.</para> +</listitem> +</varlistentry> + </variablelist> </refsect1> @@ -221,7 +292,7 @@ >Приклади</title> <para ->Вивести каталог найвищого рівня встановленого &kde;:</para> +>Вивести каталог найвищого рівня встановлених Frameworks:</para> <para ><prompt >%</prompt @@ -261,7 +332,7 @@ <title >Прочитайте також</title> <para ->kdeoptions(7)</para> +>kf5options(7)</para> </refsect1> <refsect1> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/src/kdecore/all_languages.desktop new/kdelibs4support-5.13.0/src/kdecore/all_languages.desktop --- old/kdelibs4support-5.12.0/src/kdecore/all_languages.desktop 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/src/kdecore/all_languages.desktop 2015-08-04 12:52:18.000000000 +0200 @@ -9477,7 +9477,7 @@ Name[pl]=z Wysp Marshalla Name[ps]=مارشالي Name[pt]=Marselhês -Name[pt_BR]=Marchalês +Name[pt_BR]=Marshalês Name[ro]=Marșaleză Name[ru]=Маршалльский Name[se]=Marshallagiella diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/src/kdeui/kapplication.h new/kdelibs4support-5.13.0/src/kdeui/kapplication.h --- old/kdelibs4support-5.12.0/src/kdeui/kapplication.h 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/src/kdeui/kapplication.h 2015-08-04 12:52:18.000000000 +0200 @@ -138,6 +138,11 @@ * * Useful in case your application is started by the * initial "startkde" script. + * + * @deprecated, use qunsetenv("SESSION_MANAGER") or + * call QSessionManager::setRestartHint(QSessionManager::RestartNever) + * in the slot connected to commitDataRequest. + * TODO: contribute a QGuiApplication::disableSessionManagement() method */ void disableSessionManagement(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/src/kdeui/kdialog.h new/kdelibs4support-5.13.0/src/kdeui/kdialog.h --- old/kdelibs4support-5.12.0/src/kdeui/kdialog.h 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/src/kdeui/kdialog.h 2015-08-04 12:52:18.000000000 +0200 @@ -354,7 +354,7 @@ * @note the group must be set before calling * * @param config The config group to read from. - * @deprecated use KWindowConfig::restoreDialogSize() instead + * @deprecated use KWindowConfig::restoreWindowSize() instead */ #ifndef KDELIBS4SUPPORT_NO_DEPRECATED KDELIBS4SUPPORT_DEPRECATED void restoreDialogSize(const KConfigGroup &config); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/src/kssl/kcm/kcm_ssl.desktop new/kdelibs4support-5.13.0/src/kssl/kcm/kcm_ssl.desktop --- old/kdelibs4support-5.12.0/src/kssl/kcm/kcm_ssl.desktop 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/src/kssl/kcm/kcm_ssl.desktop 2015-08-04 12:52:18.000000000 +0200 @@ -182,7 +182,7 @@ X-KDE-Keywords[pa]=SSL,ਸੁਰੱਖਿਆ,ਨੈੱਟਵਰਕ,ਪ੍ਰੋਟੋਕਾਲ,ਸਰਟੀਫਿਕੇਟ,ਇੰਕ੍ਰਿਪਸ਼ਨ,HTTPS X-KDE-Keywords[pl]=SSL,Bezpieczeństwo,Sieć,Protokół,Certyfikaty,Szyfrowanie,HTTPS X-KDE-Keywords[pt]=SSL,Segurança,Rede,Protocolo,Certificados,Encriptação,HTTPS -X-KDE-Keywords[pt_BR]=SSL,segurança,rede,protocolo,certificados,criptografia,HTTPS +X-KDE-Keywords[pt_BR]=SSL,Segurança,Rede,Protocolo,Certificados,Criptografia,HTTPS X-KDE-Keywords[ro]=SSL,Securitate,Rețea,Protocol,Certificate,Criptare,HTTPS X-KDE-Keywords[ru]=SSL,Security,Network,Protocol,Certificates,Encryption,HTTPS,протокол,защищенный,защищённый,сеть,сертификаты,безопасность,шифрование X-KDE-Keywords[sk]=SSL,Security,Network,Protocol,Certificates,Encryption,HTTPS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/src/l10n/bj/country.desktop new/kdelibs4support-5.13.0/src/l10n/bj/country.desktop --- old/kdelibs4support-5.12.0/src/l10n/bj/country.desktop 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/src/l10n/bj/country.desktop 2015-08-04 12:52:18.000000000 +0200 @@ -64,7 +64,7 @@ Name[pa]=ਬੀਨਿਨ Name[pl]=Benin Name[pt]=Benim -Name[pt_BR]=Benin +Name[pt_BR]=Benim Name[ro]=Benin Name[ru]=Бенин Name[se]=Benin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/src/l10n/tz/country.desktop new/kdelibs4support-5.13.0/src/l10n/tz/country.desktop --- old/kdelibs4support-5.12.0/src/l10n/tz/country.desktop 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/src/l10n/tz/country.desktop 2015-08-04 12:52:18.000000000 +0200 @@ -63,7 +63,7 @@ Name[pa]=ਤਾਨਜ਼ੂਈਆ, ਸੰਯੁਕਤ ਗਣਰਾਜ Name[pl]=Zjednoczona Republika Tanzanii Name[pt]=República da União da Tanzânia -Name[pt_BR]=República da Tanzânia +Name[pt_BR]=Tanzânia, República Unida Da Name[ro]=Tanzania, Republica Unită Name[ru]=Танзания Name[se]=Tanzania diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.12.0/tests/CMakeLists.txt new/kdelibs4support-5.13.0/tests/CMakeLists.txt --- old/kdelibs4support-5.12.0/tests/CMakeLists.txt 2015-07-05 10:57:10.000000000 +0200 +++ new/kdelibs4support-5.13.0/tests/CMakeLists.txt 2015-08-04 12:52:18.000000000 +0200 @@ -63,7 +63,7 @@ ###### kxerrorhandlertest ##### if (X11_FOUND) - find_package(Qt5X11Extras 5.2.0 REQUIRED NO_MODULE) + find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) kdelibs4support_examples( kxerrorhandlertest ) target_link_libraries(kxerrorhandlertest ${X11_X11_LIB} Qt5::X11Extras)
