From: Ivailo Monev Date: Sat, 1 Aug 2020 19:49:08 +0000 (+0300) Subject: reduce QStyleSheetStyle::getDefaultStyleSheet() calls X-Git-Tag: 4.12.0~3647 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c3c697ea5b4e141f08c4607955f085c49667b806;p=kde%2FKatie.git reduce QStyleSheetStyle::getDefaultStyleSheet() calls Signed-off-by: Ivailo Monev --- diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp index 0e4c48437..a331723b0 100644 --- a/src/gui/styles/qstylesheetstyle.cpp +++ b/src/gui/styles/qstylesheetstyle.cpp @@ -1499,15 +1499,12 @@ QVector QStyleSheetStyle::styleRules(const QWidget *w) const QStyleSheetStyleSelector styleSelector; - StyleSheet defaultSs; - QHash::const_iterator defaultCacheIt = styleSheetCaches->styleSheetCache.constFind(baseStyle()); + QStyle *bs = baseStyle(); + static StyleSheet defaultSs = getDefaultStyleSheet(); + QHash::const_iterator defaultCacheIt = styleSheetCaches->styleSheetCache.constFind(bs); if (defaultCacheIt == styleSheetCaches->styleSheetCache.constEnd()) { - defaultSs = getDefaultStyleSheet(); - QStyle *bs = baseStyle(); styleSheetCaches->styleSheetCache.insert(bs, defaultSs); QObject::connect(bs, SIGNAL(destroyed(QObject*)), styleSheetCaches, SLOT(styleDestroyed(QObject*)), Qt::UniqueConnection); - } else { - defaultSs = defaultCacheIt.value(); } styleSelector.styleSheets += defaultSs;