commit qt5ct for openSUSE:Factory

28 Mar 2017

Hello community,

here is the log from the commit of package qt5ct for openSUSE:Factory checked in at 2017-03-28 15:22:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt5ct (Old)
 and      /work/SRC/openSUSE:Factory/.qt5ct.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "qt5ct"

Tue Mar 28 15:22:47 2017 rev:8 rq:482600 version:0.30

Changes:
--------

--- /work/SRC/openSUSE:Factory/qt5ct/qt5ct.changes	2017-01-25 23:36:57.315607334 +0100
+++ /work/SRC/openSUSE:Factory/.qt5ct.new/qt5ct.changes	2017-03-28 15:24:21.403428210 +0200
@@ -1,0 +2,10 @@
+Fri Mar 24 15:00:47 UTC 2017 - alarrosa@suse.com
+
+- Update to version 0.30:
+ * Fixed crash on nonexistent style in qt5ct.conf
+ * Fixed issue with KDE color themes
+ * Updated documentation
+ * Updated Bulgarian translation
+ * Updated French translation
+ 
+-------------------------------------------------------------------

Old:
----
  qt5ct-0.29.tar.bz2

New:
----
  qt5ct-0.30.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ qt5ct.spec ++++++
--- /var/tmp/diff_new_pack.hqnmws/_old	2017-03-28 15:24:22.039338153 +0200
+++ /var/tmp/diff_new_pack.hqnmws/_new	2017-03-28 15:24:22.039338153 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           qt5ct
-Version:        0.29
+Version:        0.30
 Release:        0
 Summary:        Qt5 Configuration Tool
 License:        BSD-2-Clause

++++++ qt5ct-0.29.tar.bz2 -> qt5ct-0.30.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.29/ChangeLog new/qt5ct-0.30/ChangeLog
--- old/qt5ct-0.29/ChangeLog	2017-01-25 06:18:01.000000000 +0100
+++ new/qt5ct-0.30/ChangeLog	2017-02-04 13:53:34.000000000 +0100
@@ -186,3 +186,10 @@
 Version 0.29
 * fixed libqt5ct-style.so installation path (Philip Müller)
 * updated Greek translation (Dimitrios Glentadakis)
+
+Version 0.30
+* fixed crash on nonexistent style in qt5ct.conf
+* fixed issue with KDE color themes
+* updated documentation
+* updated Bulgarian translation (Kiril Kirilov)
+* updated French translation (Geiger David)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.29/ChangeLog.svn new/qt5ct-0.30/ChangeLog.svn
--- old/qt5ct-0.29/ChangeLog.svn	2017-01-25 06:18:01.000000000 +0100
+++ new/qt5ct-0.30/ChangeLog.svn	2017-02-04 13:53:34.000000000 +0100
@@ -1,4 +1,44 @@
 ------------------------------------------------------------------------
+r374 | trialuser02 | 2017-02-04 15:52:12 +0300 (Сб., 04 февр. 2017) | 1 line
+
+fixed changelog
+------------------------------------------------------------------------
+r373 | trialuser02 | 2017-01-30 15:23:31 +0300 (Пн., 30 янв. 2017) | 1 line
+
+updated changelog
+------------------------------------------------------------------------
+r372 | trialuser02 | 2017-01-30 09:24:32 +0300 (Пн., 30 янв. 2017) | 1 line
+
+updated changelog
+------------------------------------------------------------------------
+r371 | trialuser02 | 2017-01-29 21:44:26 +0300 (Вс., 29 янв. 2017) | 1 line
+
+fixed segmentation fault with nonexistent style in the qt5ct.conf
+------------------------------------------------------------------------
+r370 | trialuser02 | 2017-01-27 10:09:35 +0300 (Пт., 27 янв. 2017) | 1 line
+
+updated changelog
+------------------------------------------------------------------------
+r369 | trialuser02 | 2017-01-26 20:40:33 +0300 (Чт., 26 янв. 2017) | 1 line
+
+fixed issue with kde styles (#32)
+------------------------------------------------------------------------
+r368 | trialuser02 | 2017-01-26 08:18:41 +0300 (Чт., 26 янв. 2017) | 1 line
+
+updated French translation (Geiger David)
+------------------------------------------------------------------------
+r367 | trialuser02 | 2017-01-25 16:15:17 +0300 (Ср., 25 янв. 2017) | 1 line
+
+updated  Bulgarian translation (Kiril Kirilov)
+------------------------------------------------------------------------
+r366 | trialuser02 | 2017-01-25 12:15:20 +0300 (Ср., 25 янв. 2017) | 1 line
+
+fixed documentation
+------------------------------------------------------------------------
+r365 | trialuser02 | 2017-01-25 08:18:36 +0300 (Ср., 25 янв. 2017) | 1 line
+
+version bump
+------------------------------------------------------------------------
 r363 | trialuser02 | 2017-01-25 08:14:51 +0300 (Ср., 25 янв. 2017) | 1 line
 
 fixed changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.29/README new/qt5ct-0.30/README
--- old/qt5ct-0.29/README	2017-01-25 06:18:01.000000000 +0100
+++ new/qt5ct-0.30/README	2017-02-04 13:53:34.000000000 +0100
@@ -29,7 +29,7 @@
 
 Extra build options (for advanced users only):
 qmake DISABLE_WIDGETS=1 - compiles platform plugin without QtWidgets (useful for QML applications only)
-qmake PLUGINDIR=<custom path> - changes the install path of the platform plugin (libqt5ct.so)
+qmake PLUGINDIR=<custom path> - changes the default installation path of the plugins (libqt5ct.so and libqt5ct-style.so)
 
 Debug Messages:
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.29/src/qt5ct/desktop-translations/qt5ct_bg.desktop.in new/qt5ct-0.30/src/qt5ct/desktop-translations/qt5ct_bg.desktop.in
--- old/qt5ct-0.29/src/qt5ct/desktop-translations/qt5ct_bg.desktop.in	2017-01-25 06:18:01.000000000 +0100
+++ new/qt5ct-0.30/src/qt5ct/desktop-translations/qt5ct_bg.desktop.in	2017-02-04 13:53:34.000000000 +0100
@@ -19,6 +19,7 @@
 
 
 
+
 Exec=qt5ct
 Icon=preferences-desktop-theme
 Terminal=false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.29/src/qt5ct/desktop-translations/qt5ct_fr.desktop.in new/qt5ct-0.30/src/qt5ct/desktop-translations/qt5ct_fr.desktop.in
--- old/qt5ct-0.29/src/qt5ct/desktop-translations/qt5ct_fr.desktop.in	2017-01-25 06:18:01.000000000 +0100
+++ new/qt5ct-0.30/src/qt5ct/desktop-translations/qt5ct_fr.desktop.in	2017-02-04 13:53:34.000000000 +0100
@@ -19,6 +19,7 @@
 
 
 
+
 Exec=qt5ct
 Icon=preferences-desktop-theme
 Terminal=false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.29/src/qt5ct/qt5ct.h new/qt5ct-0.30/src/qt5ct/qt5ct.h
--- old/qt5ct-0.29/src/qt5ct/qt5ct.h	2017-01-25 06:18:01.000000000 +0100
+++ new/qt5ct-0.30/src/qt5ct/qt5ct.h	2017-02-04 13:53:34.000000000 +0100
@@ -30,7 +30,7 @@
 #define QT5CT_H
 
 #define QT5CT_VERSION_MAJOR 0
-#define QT5CT_VERSION_MINOR 29
+#define QT5CT_VERSION_MINOR 30
 
 #define QT5CT_TOSTRING(s) #s
 #define QT5CT_STRINGIFY(s)         QT5CT_TOSTRING(s)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.29/src/qt5ct/translations/qt5ct_bg.ts new/qt5ct-0.30/src/qt5ct/translations/qt5ct_bg.ts
--- old/qt5ct-0.29/src/qt5ct/translations/qt5ct_bg.ts	2017-01-25 06:18:01.000000000 +0100
+++ new/qt5ct-0.30/src/qt5ct/translations/qt5ct_bg.ts	2017-02-04 13:53:34.000000000 +0100
@@ -663,7 +663,7 @@
     <message>
         <location filename="../main.cpp" line="71"/>
         <source>Unable to find <b>libqt5ct-style.so</b></source>
-        <translation type="unfinished"></translation>
+        <translation>Не може да бъде намерен <b>libqt5ct-style.so</b></translation>
     </message>
     <message>
         <location filename="../main.cpp" line="76"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.29/src/qt5ct/translations/qt5ct_fr.ts new/qt5ct-0.30/src/qt5ct/translations/qt5ct_fr.ts
--- old/qt5ct-0.29/src/qt5ct/translations/qt5ct_fr.ts	2017-01-25 06:18:01.000000000 +0100
+++ new/qt5ct-0.30/src/qt5ct/translations/qt5ct_fr.ts	2017-02-04 13:53:34.000000000 +0100
@@ -663,7 +663,7 @@
     <message>
         <location filename="../main.cpp" line="71"/>
         <source>Unable to find <b>libqt5ct-style.so</b></source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de trouver <b>libqt5ct-style.so</b></translation>
     </message>
     <message>
         <location filename="../main.cpp" line="76"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.29/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp new/qt5ct-0.30/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp
--- old/qt5ct-0.29/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp	2017-01-25 06:18:01.000000000 +0100
+++ new/qt5ct-0.30/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp	2017-02-04 13:53:34.000000000 +0100
@@ -101,9 +101,8 @@
 
 const QPalette *Qt5CTPlatformTheme::palette(QPlatformTheme::Palette type) const
 {
-    if(m_customPalette && m_usePalette)
-        return m_customPalette;
-    return QPlatformTheme::palette(type);
+    Q_UNUSED(type);
+    return (m_usePalette ? m_customPalette : 0);
 }
 
 const QFont *Qt5CTPlatformTheme::font(QPlatformTheme::Font type) const
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.29/src/qt5ct-style/plugin.cpp new/qt5ct-0.30/src/qt5ct-style/plugin.cpp
--- old/qt5ct-0.29/src/qt5ct-style/plugin.cpp	2017-01-25 06:18:01.000000000 +0100
+++ new/qt5ct-0.30/src/qt5ct-style/plugin.cpp	2017-02-04 13:53:34.000000000 +0100
@@ -28,6 +28,7 @@
 
 #include <QStylePlugin>
 #include <QSettings>
+#include <QStyleFactory>
 #include <qt5ct/qt5ct.h>
 #include "qt5ctproxystyle.h"
 
@@ -46,7 +47,7 @@
     {
         QSettings settings(Qt5CT::configFile(), QSettings::IniFormat);
         QString style = settings.value("Appearance/style", "Fusion").toString();
-        if(key == style)
+        if(key == style || !QStyleFactory::keys().contains(style))
             style = "Fusion";
         return new Qt5CTProxyStyle(style);
     }

    

root＠hilbert.suse.de

tags

participants (1)