Merge branch 'release/21.12'

diff --cc src/kitemviews/kstandarditemlistwidget.cpp
index b17fac6d55568fef1a6aa508c3658ccadce446a2,9c527fa171deb2e4b74672b9cf6ca40c8e642e67..04d8e0f7e2f166e5d71e69d642bb8163155842b3
--- 1/src/kitemviews/kstandarditemlistwidget.cpp
--- 2/src/kitemviews/kstandarditemlistwidget.cpp
+++ b/src/kitemviews/kstandarditemlistwidget.cpp
@@@ -226,25 -223,11 +226,11 @@@ void KStandardItemListWidgetInformant::
      logicalWidthHint = height;
  }
  
 -void KStandardItemListWidgetInformant::calculateDetailsLayoutItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const
 +void KStandardItemListWidgetInformant::calculateDetailsLayoutItemSizeHints(QVector<std::pair<qreal, bool>>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const
  {
      const KItemListStyleOption& option = view->styleOption();
- 
-     float zoomLevel = 1;
-     if (option.iconSize >= KIconLoader::SizeEnormous) {
-         zoomLevel = 2;
-     } else if (option.iconSize >= KIconLoader::SizeHuge) {
-         zoomLevel = 1.8;
-     } else if (option.iconSize >= KIconLoader::SizeLarge) {
-         zoomLevel = 1.6;
-     } else if (option.iconSize >= KIconLoader::SizeMedium) {
-         zoomLevel = 1.4;
-     } else if (option.iconSize >= KIconLoader::SizeSmallMedium) {
-         zoomLevel = 1.2;
-     }
- 
-     const qreal contentHeight = qMax<qreal>(option.iconSize, zoomLevel * option.fontMetrics.height());
-     logicalHeightHints.fill(std::make_pair(contentHeight + 2 * option.padding, false));
+     const qreal height = option.padding * 2 + qMax(option.iconSize, option.fontMetrics.height());
+     logicalHeightHints.fill(height);
      logicalWidthHint = -1.0;
  }