Hello community, here is the log from the commit of package kdeclarative for openSUSE:Factory checked in at 2017-10-27 13:54:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdeclarative (Old) and /work/SRC/openSUSE:Factory/.kdeclarative.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdeclarative" Fri Oct 27 13:54:04 2017 rev:47 rq:536313 version:5.39.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdeclarative/kdeclarative.changes 2017-09-19 16:31:25.203100352 +0200 +++ /work/SRC/openSUSE:Factory/.kdeclarative.new/kdeclarative.changes 2017-10-27 13:54:22.551777552 +0200 @@ -1,0 +2,13 @@ +Mon Oct 23 06:41:38 CEST 2017 - [email protected] + +- Update to 5.39.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.39.0.php +- Changes since 5.38.0: + * Remove copy of the GPL + * Relicense to LGPL2.1+ (part 2) + * Relicense some files to LGPL2.1+ + * Added openService() method to KRunProxy + +------------------------------------------------------------------- Old: ---- kdeclarative-5.38.0.tar.xz New: ---- kdeclarative-5.39.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeclarative.spec ++++++ --- /var/tmp/diff_new_pack.SMt4tz/_old 2017-10-27 13:54:23.379738851 +0200 +++ /var/tmp/diff_new_pack.SMt4tz/_new 2017-10-27 13:54:23.387738478 +0200 @@ -18,13 +18,13 @@ %bcond_without lang %define lname libKF5Declarative5 -%define _tar_path 5.38 +%define _tar_path 5.39 # 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: kdeclarative -Version: 5.38.0 +Version: 5.39.0 Release: 0 %define kf5_version %{version} Summary: Integration of QML and KDE workspaces ++++++ kdeclarative-5.38.0.tar.xz -> kdeclarative-5.39.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.38.0/CMakeLists.txt new/kdeclarative-5.39.0/CMakeLists.txt --- old/kdeclarative-5.38.0/CMakeLists.txt 2017-09-03 10:03:18.000000000 +0200 +++ new/kdeclarative-5.39.0/CMakeLists.txt 2017-10-07 21:10:46.000000000 +0200 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.38.0") # handled by release scripts -set(KF5_DEP_VERSION "5.38.0") # handled by release scripts +set(KF5_VERSION "5.39.0") # handled by release scripts +set(KF5_DEP_VERSION "5.39.0") # handled by release scripts project(KDeclarative VERSION ${KF5_VERSION}) # Dependencies include(FeatureSummary) -find_package(ECM 5.38.0 NO_MODULE) +find_package(ECM 5.39.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/kdeclarative-5.38.0/COPYING new/kdeclarative-5.39.0/COPYING --- old/kdeclarative-5.38.0/COPYING 2017-09-03 10:03:18.000000000 +0200 +++ new/kdeclarative-5.39.0/COPYING 1970-01-01 01:00:00.000000000 +0100 @@ -1,346 +0,0 @@ -NOTE! The GPL below is copyrighted by the Free Software Foundation, but -the instance of code that it refers to (the kde programs) are copyrighted -by the authors who actually wrote it. - ---------------------------------------------------------------------------- - - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 19yy <name of author> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) 19yy name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.38.0/po/ja/kdeclarative5.po new/kdeclarative-5.39.0/po/ja/kdeclarative5.po --- old/kdeclarative-5.38.0/po/ja/kdeclarative5.po 2017-09-03 10:03:18.000000000 +0200 +++ new/kdeclarative-5.39.0/po/ja/kdeclarative5.po 2017-10-07 21:10:46.000000000 +0200 @@ -81,12 +81,11 @@ "some applications use.\n" "Do you really want to use it as a global shortcut as well?" msgstr "" -"キーの組み合わせ <shortcut>%1</shortcut> は、複数のアプリケーションが使用する" -"標準アクション<interface>%2</interface>に割り当てられています。\n" +"キーの組み合わせ %1 は、複数のアプリケーションが使用する標準アクション「%2」" +"に割り当てられています。\n" "本当にこれをグローバルショートカットとしても使いますか？|/|キーの組み合わせ " -"<shortcut>%1</shortcut> は、複数のアプリケーションが使用する標準アクション" -"<interface>$[~stripAccel $[~getForm %2 ~full]]</interface>に割り当てられてい" -"ます。\n" +"%1 は、複数のアプリケーションが使用する標準アクション「$[~stripAccel " +"$[~getForm %2 ~full]]」に割り当てられています。\n" "本当にこれをグローバルショートカットとしても使いますか？" #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:339 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.38.0/po/sr/kdeclarative5.po new/kdeclarative-5.39.0/po/sr/kdeclarative5.po --- old/kdeclarative-5.38.0/po/sr/kdeclarative5.po 2017-09-03 10:03:18.000000000 +0200 +++ new/kdeclarative-5.39.0/po/sr/kdeclarative5.po 2017-10-07 21:10:46.000000000 +0200 @@ -1,14 +1,14 @@ # Translation of kdeclarative5.po into Serbian. # Marko Rosic <[email protected]>, 2003. # Toplica Tanaskovic <[email protected]>, 2003, 2004, 2005. -# Chusslove Illich <[email protected]>, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. +# Chusslove Illich <[email protected]>, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2017. # Dalibor Djuric <[email protected]>, 2009, 2010, 2011. msgid "" msgstr "" "Project-Id-Version: kdeclarative5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-06-30 03:05+0200\n" -"PO-Revision-Date: 2015-03-07 13:10+0100\n" +"PO-Revision-Date: 2017-09-28 17:57+0200\n" "Last-Translator: Chusslove Illich <[email protected]>\n" "Language-Team: Serbian <[email protected]>\n" "Language: sr\n" @@ -79,8 +79,8 @@ "some applications use.\n" "Do you really want to use it as a global shortcut as well?" msgstr "" -"Комбинација тастера <shortcut>%1</shortcut> већ је додељена стандардној " -"радњи „%2“, коју користе неки програми.\n" +"Комбинација тастера %1 већ је додељена стандардној радњи „%2“, коју користе " +"неки програми.\n" "Желите ли заиста да је користите и као глобалну пречицу?" #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:339 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.38.0/po/sr@ijekavian/kdeclarative5.po new/kdeclarative-5.39.0/po/sr@ijekavian/kdeclarative5.po --- old/kdeclarative-5.38.0/po/sr@ijekavian/kdeclarative5.po 2017-09-03 10:03:18.000000000 +0200 +++ new/kdeclarative-5.39.0/po/sr@ijekavian/kdeclarative5.po 2017-10-07 21:10:46.000000000 +0200 @@ -1,14 +1,14 @@ # Translation of kdeclarative5.po into Serbian. # Marko Rosic <[email protected]>, 2003. # Toplica Tanaskovic <[email protected]>, 2003, 2004, 2005. -# Chusslove Illich <[email protected]>, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. +# Chusslove Illich <[email protected]>, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2017. # Dalibor Djuric <[email protected]>, 2009, 2010, 2011. msgid "" msgstr "" "Project-Id-Version: kdeclarative5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-06-30 03:05+0200\n" -"PO-Revision-Date: 2015-03-07 13:10+0100\n" +"PO-Revision-Date: 2017-09-28 17:57+0200\n" "Last-Translator: Chusslove Illich <[email protected]>\n" "Language-Team: Serbian <[email protected]>\n" "Language: sr@ijekavian\n" @@ -78,8 +78,8 @@ "some applications use.\n" "Do you really want to use it as a global shortcut as well?" msgstr "" -"Комбинација тастера <shortcut>%1</shortcut> већ је додијељена стандардној " -"радњи „%2“, коју користе неки програми.\n" +"Комбинација тастера %1 већ је додијељена стандардној радњи „%2“, коју " +"користе неки програми.\n" "Желите ли заиста да је користите и као глобалну пречицу?" #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:339 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.38.0/po/sr@ijekavianlatin/kdeclarative5.po new/kdeclarative-5.39.0/po/sr@ijekavianlatin/kdeclarative5.po --- old/kdeclarative-5.38.0/po/sr@ijekavianlatin/kdeclarative5.po 2017-09-03 10:03:18.000000000 +0200 +++ new/kdeclarative-5.39.0/po/sr@ijekavianlatin/kdeclarative5.po 2017-10-07 21:10:46.000000000 +0200 @@ -1,14 +1,14 @@ # Translation of kdeclarative5.po into Serbian. # Marko Rosic <[email protected]>, 2003. # Toplica Tanaskovic <[email protected]>, 2003, 2004, 2005. -# Chusslove Illich <[email protected]>, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. +# Chusslove Illich <[email protected]>, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2017. # Dalibor Djuric <[email protected]>, 2009, 2010, 2011. msgid "" msgstr "" "Project-Id-Version: kdeclarative5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-06-30 03:05+0200\n" -"PO-Revision-Date: 2015-03-07 13:10+0100\n" +"PO-Revision-Date: 2017-09-28 17:57+0200\n" "Last-Translator: Chusslove Illich <[email protected]>\n" "Language-Team: Serbian <[email protected]>\n" "Language: sr@ijekavianlatin\n" @@ -78,8 +78,8 @@ "some applications use.\n" "Do you really want to use it as a global shortcut as well?" msgstr "" -"Kombinacija tastera <shortcut>%1</shortcut> već je dodijeljena standardnoj " -"radnji „%2“, koju koriste neki programi.\n" +"Kombinacija tastera %1 već je dodijeljena standardnoj radnji „%2“, koju " +"koriste neki programi.\n" "Želite li zaista da je koristite i kao globalnu prečicu?" #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:339 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.38.0/po/sr@latin/kdeclarative5.po new/kdeclarative-5.39.0/po/sr@latin/kdeclarative5.po --- old/kdeclarative-5.38.0/po/sr@latin/kdeclarative5.po 2017-09-03 10:03:18.000000000 +0200 +++ new/kdeclarative-5.39.0/po/sr@latin/kdeclarative5.po 2017-10-07 21:10:46.000000000 +0200 @@ -1,14 +1,14 @@ # Translation of kdeclarative5.po into Serbian. # Marko Rosic <[email protected]>, 2003. # Toplica Tanaskovic <[email protected]>, 2003, 2004, 2005. -# Chusslove Illich <[email protected]>, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. +# Chusslove Illich <[email protected]>, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2017. # Dalibor Djuric <[email protected]>, 2009, 2010, 2011. msgid "" msgstr "" "Project-Id-Version: kdeclarative5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-06-30 03:05+0200\n" -"PO-Revision-Date: 2015-03-07 13:10+0100\n" +"PO-Revision-Date: 2017-09-28 17:57+0200\n" "Last-Translator: Chusslove Illich <[email protected]>\n" "Language-Team: Serbian <[email protected]>\n" "Language: sr@latin\n" @@ -78,8 +78,8 @@ "some applications use.\n" "Do you really want to use it as a global shortcut as well?" msgstr "" -"Kombinacija tastera <shortcut>%1</shortcut> već je dodeljena standardnoj " -"radnji „%2“, koju koriste neki programi.\n" +"Kombinacija tastera %1 već je dodeljena standardnoj radnji „%2“, koju " +"koriste neki programi.\n" "Želite li zaista da je koristite i kao globalnu prečicu?" #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:339 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.38.0/po/zh_CN/kdeclarative5.po new/kdeclarative-5.39.0/po/zh_CN/kdeclarative5.po --- old/kdeclarative-5.38.0/po/zh_CN/kdeclarative5.po 2017-09-03 10:03:18.000000000 +0200 +++ new/kdeclarative-5.39.0/po/zh_CN/kdeclarative5.po 2017-10-07 21:10:46.000000000 +0200 @@ -1,9 +1,21 @@ +# translation of kdelibs4.po to Chinese Simplified +# Copyright (C) 2007 Free Software Foundation, Inc. +# +# Lie Ex <[email protected]> 2007-2011. +# Wang Jian <[email protected]>, 1998. +# Sarah Smith <[email protected]>, 2002. +# Xiong Jiang <[email protected]>, 2002,2003,2004. +# Funda Wang <[email protected]>, 2002,2003,2004. +# Liang Qi <[email protected]>, 2007. +# Feng Chao <[email protected]>, 2010, 2012, 2014. +# Ni Hui <[email protected]>, 2010, 2011, 2012. +# Weng Xuetian <[email protected]>, 2011, 2012, 2013, 2015. msgid "" msgstr "" "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-06-30 03:05+0200\n" -"PO-Revision-Date: 2017-08-31 05:10-0400\n" +"PO-Revision-Date: 2017-09-30 17:44-0400\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.38.0/src/calendarevents/calendareventsplugin.cpp new/kdeclarative-5.39.0/src/calendarevents/calendareventsplugin.cpp --- old/kdeclarative-5.38.0/src/calendarevents/calendareventsplugin.cpp 2017-09-03 10:03:18.000000000 +0200 +++ new/kdeclarative-5.39.0/src/calendarevents/calendareventsplugin.cpp 2017-10-07 21:10:46.000000000 +0200 @@ -1,21 +1,21 @@ /* - Copyright (C) 2015 Martin Klapetek <[email protected]> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -*/ + * Copyright 2015 Martin Klapetek <[email protected]> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ #include "calendareventsplugin.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.38.0/src/calendarevents/calendareventsplugin.h new/kdeclarative-5.39.0/src/calendarevents/calendareventsplugin.h --- old/kdeclarative-5.38.0/src/calendarevents/calendareventsplugin.h 2017-09-03 10:03:18.000000000 +0200 +++ new/kdeclarative-5.39.0/src/calendarevents/calendareventsplugin.h 2017-10-07 21:10:46.000000000 +0200 @@ -1,21 +1,21 @@ /* - Copyright (C) 2015 Martin Klapetek <[email protected]> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -*/ + * Copyright 2015 Martin Klapetek <[email protected]> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ #ifndef CALENDAREVENTSPLUGIN_H #define CALENDAREVENTSPLUGIN_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.38.0/src/calendarevents/eventdata_p.cpp new/kdeclarative-5.39.0/src/calendarevents/eventdata_p.cpp --- old/kdeclarative-5.38.0/src/calendarevents/eventdata_p.cpp 2017-09-03 10:03:18.000000000 +0200 +++ new/kdeclarative-5.39.0/src/calendarevents/eventdata_p.cpp 2017-10-07 21:10:46.000000000 +0200 @@ -1,21 +1,21 @@ /* - Copyright (C) 2015 Martin Klapetek <[email protected]> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -*/ + * Copyright 2015 Martin Klapetek <[email protected]> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ #include "calendareventsplugin.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.38.0/src/qmlcontrols/kioplugin/krunproxy.cpp new/kdeclarative-5.39.0/src/qmlcontrols/kioplugin/krunproxy.cpp --- old/kdeclarative-5.38.0/src/qmlcontrols/kioplugin/krunproxy.cpp 2017-09-03 10:03:18.000000000 +0200 +++ new/kdeclarative-5.39.0/src/qmlcontrols/kioplugin/krunproxy.cpp 2017-10-07 21:10:46.000000000 +0200 @@ -41,7 +41,7 @@ } if (fileMymeType == QStringLiteral("application/x-desktop")) { - // If our mimetype is a desktop file, then we don't won't to open + // If our mimetype is a desktop file, then we don't want to open // the desktop file itself but the application in which it is associated // with. KService::Ptr service = KService::serviceByDesktopPath(filePath); @@ -50,3 +50,11 @@ return KRun::runUrl(QUrl(filePath), fileMymeType, nullptr); } } + +bool KRunProxy::openService(const QString &serviceName) +{ + KService::Ptr service = KService::serviceByDesktopName(serviceName); + if(service) + return KRun::runApplication(*service, QList<QUrl>(), nullptr) != 0; + return false; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.38.0/src/qmlcontrols/kioplugin/krunproxy.h new/kdeclarative-5.39.0/src/qmlcontrols/kioplugin/krunproxy.h --- old/kdeclarative-5.38.0/src/qmlcontrols/kioplugin/krunproxy.h 2017-09-03 10:03:18.000000000 +0200 +++ new/kdeclarative-5.39.0/src/qmlcontrols/kioplugin/krunproxy.h 2017-10-07 21:10:46.000000000 +0200 @@ -33,6 +33,13 @@ * opens the url from the existing file */ Q_INVOKABLE bool openUrl(const QString &filePath); + + /** + * Runs the service (application) + * @param serviceName the name of the desktop file without extension + * @return true on success + */ + Q_INVOKABLE bool openService(const QString &serviceName); }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.38.0/src/qmlcontrols/kquickcontrolsaddons/eventgenerator.cpp new/kdeclarative-5.39.0/src/qmlcontrols/kquickcontrolsaddons/eventgenerator.cpp --- old/kdeclarative-5.38.0/src/qmlcontrols/kquickcontrolsaddons/eventgenerator.cpp 2017-09-03 10:03:18.000000000 +0200 +++ new/kdeclarative-5.39.0/src/qmlcontrols/kquickcontrolsaddons/eventgenerator.cpp 2017-10-07 21:10:46.000000000 +0200 @@ -1,23 +1,22 @@ -/*************************************************************************** +/* * Copyright (C) 2015 by Eike Hein <[email protected]> * Copyright (C) 2015 Marco Martin <[email protected]> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . * - ***************************************************************************/ + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ #include "eventgenerator.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.38.0/src/qmlcontrols/kquickcontrolsaddons/eventgenerator.h new/kdeclarative-5.39.0/src/qmlcontrols/kquickcontrolsaddons/eventgenerator.h --- old/kdeclarative-5.38.0/src/qmlcontrols/kquickcontrolsaddons/eventgenerator.h 2017-09-03 10:03:18.000000000 +0200 +++ new/kdeclarative-5.39.0/src/qmlcontrols/kquickcontrolsaddons/eventgenerator.h 2017-10-07 21:10:46.000000000 +0200 @@ -1,23 +1,23 @@ -/*************************************************************************** +/* * Copyright (C) 2015 by Eike Hein <[email protected]> * Copyright (C) 2015 Marco Martin <[email protected]> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . * - ***************************************************************************/ + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + #ifndef EventGenerator_H #define EventGenerator_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.38.0/src/qmlcontrols/kquickcontrolsaddons/kcmshell.cpp new/kdeclarative-5.39.0/src/qmlcontrols/kquickcontrolsaddons/kcmshell.cpp --- old/kdeclarative-5.38.0/src/qmlcontrols/kquickcontrolsaddons/kcmshell.cpp 2017-09-03 10:03:18.000000000 +0200 +++ new/kdeclarative-5.39.0/src/qmlcontrols/kquickcontrolsaddons/kcmshell.cpp 2017-10-07 21:10:46.000000000 +0200 @@ -1,21 +1,21 @@ -/*************************************************************************** - * Copyright 2015 Kai Uwe Broulik <[email protected]> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . * - ***************************************************************************/ +/* + * Copyright 2015 Kai Uwe Broulik <[email protected]> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ #include "kcmshell.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.38.0/src/qmlcontrols/kquickcontrolsaddons/kcmshell.h new/kdeclarative-5.39.0/src/qmlcontrols/kquickcontrolsaddons/kcmshell.h --- old/kdeclarative-5.38.0/src/qmlcontrols/kquickcontrolsaddons/kcmshell.h 2017-09-03 10:03:18.000000000 +0200 +++ new/kdeclarative-5.39.0/src/qmlcontrols/kquickcontrolsaddons/kcmshell.h 2017-10-07 21:10:46.000000000 +0200 @@ -1,21 +1,21 @@ -/*************************************************************************** - * Copyright 2015 Kai Uwe Broulik <[email protected]> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . * - ***************************************************************************/ +/* + * Copyright 2015 Kai Uwe Broulik <[email protected]> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ #ifndef KCMSHELL_H #define KCMSHELL_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.38.0/src/qmlcontrols/kquickcontrolsaddons/qiconitem.h new/kdeclarative-5.39.0/src/qmlcontrols/kquickcontrolsaddons/qiconitem.h --- old/kdeclarative-5.38.0/src/qmlcontrols/kquickcontrolsaddons/qiconitem.h 2017-09-03 10:03:18.000000000 +0200 +++ new/kdeclarative-5.39.0/src/qmlcontrols/kquickcontrolsaddons/qiconitem.h 2017-10-07 21:10:46.000000000 +0200 @@ -1,21 +1,22 @@ -/*************************************************************************** - * Copyright 2011 Marco Martin <[email protected]> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . * - ***************************************************************************/ +/* + * Copyright 2011 Marco Martin <[email protected]> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + #ifndef QICONITEM_H #define QICONITEM_H @@ -37,8 +38,8 @@ public: enum State { - DefaultState, ///The default state. - ActiveState, ///Icon is active. + DefaultState, ///The default state. + ActiveState, ///Icon is active. DisabledState, ///Icon is disabled. SelectedState ///Icon is selected }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.38.0/src/qmlcontrols/kquickcontrolsaddons/qimageitem.h new/kdeclarative-5.39.0/src/qmlcontrols/kquickcontrolsaddons/qimageitem.h --- old/kdeclarative-5.38.0/src/qmlcontrols/kquickcontrolsaddons/qimageitem.h 2017-09-03 10:03:18.000000000 +0200 +++ new/kdeclarative-5.39.0/src/qmlcontrols/kquickcontrolsaddons/qimageitem.h 2017-10-07 21:10:46.000000000 +0200 @@ -1,22 +1,23 @@ -/*************************************************************************** - * Copyright 2011 Marco Martin <[email protected]> * - * Copyright 2015 Luca Beltrame <[email protected]> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . * - ***************************************************************************/ +/* + * Copyright 2011 Marco Martin <[email protected]> + * Copyright 2015 Luca Beltrame <[email protected]> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + #ifndef QIMAGEITEM_H #define QIMAGEITEM_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.38.0/src/qmlcontrols/kquickcontrolsaddons/qpixmapitem.h new/kdeclarative-5.39.0/src/qmlcontrols/kquickcontrolsaddons/qpixmapitem.h --- old/kdeclarative-5.38.0/src/qmlcontrols/kquickcontrolsaddons/qpixmapitem.h 2017-09-03 10:03:18.000000000 +0200 +++ new/kdeclarative-5.39.0/src/qmlcontrols/kquickcontrolsaddons/qpixmapitem.h 2017-10-07 21:10:46.000000000 +0200 @@ -1,22 +1,23 @@ -/*************************************************************************** - * Copyright 2011 Marco Martin <[email protected]> * - * Copyright 2015 Luca Beltrame <[email protected]> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . * - ***************************************************************************/ +/* + * Copyright 2011 Marco Martin <[email protected]> + * Copyright 2015 Luca Beltrame <[email protected]> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + #ifndef QPIXMAPITEM_H #define QPIXMAPITEM_H
