commit yast2-control-center for openSUSE:Factory
Hello community, here is the log from the commit of package yast2-control-center for openSUSE:Factory checked in at 2019-12-30 12:34:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-control-center (Old) and /work/SRC/openSUSE:Factory/.yast2-control-center.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-control-center" Mon Dec 30 12:34:28 2019 rev:81 rq:759715 version:4.2.3 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-control-center/yast2-control-center.changes 2019-09-23 13:16:01.077120027 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-control-center.new.6675/yast2-control-center.changes 2019-12-30 12:34:30.855794323 +0100 @@ -1,0 +2,6 @@ +Tue Dec 22 21:27:38 UTC 2019 - Stasiek Michalski <hellcp@mailbox.org> + +- Fix theming icons again (boo#1159283) +- 4.2.3 + +------------------------------------------------------------------- Old: ---- yast2-control-center-4.2.2.tar.bz2 New: ---- yast2-control-center-4.2.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-control-center.spec ++++++ --- /var/tmp/diff_new_pack.BrCLkW/_old 2019-12-30 12:34:31.259794540 +0100 +++ /var/tmp/diff_new_pack.BrCLkW/_new 2019-12-30 12:34:31.259794540 +0100 @@ -17,7 +17,7 @@ Name: yast2-control-center -Version: 4.2.2 +Version: 4.2.3 Release: 0 Url: https://github.com/yast/yast-control-center Summary: YaST2 - Control Center ++++++ yast2-control-center-4.2.2.tar.bz2 -> yast2-control-center-4.2.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-4.2.2/package/yast2-control-center.changes new/yast2-control-center-4.2.3/package/yast2-control-center.changes --- old/yast2-control-center-4.2.2/package/yast2-control-center.changes 2019-09-13 09:43:37.000000000 +0200 +++ new/yast2-control-center-4.2.3/package/yast2-control-center.changes 2019-12-27 17:32:37.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Dec 22 21:27:38 UTC 2019 - Stasiek Michalski <hellcp@mailbox.org> + +- Fix theming icons again (boo#1159283) +- 4.2.3 + +------------------------------------------------------------------- Tue Sep 10 22:23:37 UTC 2019 - Stasiek Michalski <hellcp@mailbox.org> - Fix appdata for new spec (fate#319035) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-4.2.2/package/yast2-control-center.spec new/yast2-control-center-4.2.3/package/yast2-control-center.spec --- old/yast2-control-center-4.2.2/package/yast2-control-center.spec 2019-09-13 09:43:37.000000000 +0200 +++ new/yast2-control-center-4.2.3/package/yast2-control-center.spec 2019-12-27 17:32:37.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-control-center -Version: 4.2.2 +Version: 4.2.3 Release: 0 Url: https://github.com/yast/yast-control-center Summary: YaST2 - Control Center diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-4.2.2/src/yqdesktopfilesmodel.cpp new/yast2-control-center-4.2.3/src/yqdesktopfilesmodel.cpp --- old/yast2-control-center-4.2.2/src/yqdesktopfilesmodel.cpp 2019-09-13 09:43:37.000000000 +0200 +++ new/yast2-control-center-4.2.3/src/yqdesktopfilesmodel.cpp 2019-12-27 17:32:37.000000000 +0100 @@ -271,14 +271,16 @@ } -QVariant YQDesktopFilesModel::findIcon( QString &icon ) const +QVariant YQDesktopFilesModel::findIcon( QString &iconName ) const { + QIcon icon = QIcon::fromTheme( iconName ); // qt5ct doesn't set a default theme - if ( QIcon::themeName().isEmpty() ) + if ( icon.isNull() && QIcon::themeName().isEmpty() ) { - QIcon::setThemeName( "hicolor" ); + QIcon::setThemeName( "hicolor" ); + icon = QIcon::fromTheme( iconName ); } - return QIcon::fromTheme(icon); + return icon; } void YQDesktopFilesModel::sort( int, Qt::SortOrder order )
participants (1)
-
root