Merge branch 'release/19.12'

1 files changed, 0 insertions, 14 deletions

diff --git a/src/kitemviews/private/kitemlistsizehintresolver.cpp b/src/kitemviews/private/kitemlistsizehintresolver.cpp
index c53bb2a4a..66784f191 100644
--- a/src/kitemviews/private/kitemlistsizehintresolver.cpp
+++ b/src/kitemviews/private/kitemlistsizehintresolver.cpp
@@ -24,7 +24,6 @@ KItemListSizeHintResolver::KItemListSizeHintResolver(const KItemListView* itemLi
     m_itemListView(itemListView),
     m_logicalHeightHintCache(),
     m_logicalWidthHint(0.0),
-    m_logicalHeightHint(0.0),
     m_minHeightHint(0.0),
     m_needsResolving(false)
 {
@@ -34,12 +33,6 @@ KItemListSizeHintResolver::~KItemListSizeHintResolver()
 {
 }
 
-QSizeF KItemListSizeHintResolver::maxSizeHint()
-{
-    updateCache();
-    return QSizeF(m_logicalWidthHint, m_logicalHeightHint);
-}
-
 QSizeF KItemListSizeHintResolver::minSizeHint()
 {
     updateCache();
@@ -162,13 +155,6 @@ void KItemListSizeHintResolver::updateCache()
 {
     if (m_needsResolving) {
         m_itemListView->calculateItemSizeHints(m_logicalHeightHintCache, m_logicalWidthHint);
-        // Set logical height as the max cached height (if the cache is not empty).
-        if (m_logicalHeightHintCache.isEmpty()) {
-            m_logicalHeightHint = 0.0;
-        } else {
-            m_logicalHeightHint = *std::max_element(m_logicalHeightHintCache.begin(), m_logicalHeightHintCache.end());
-            m_minHeightHint = *std::min_element(m_logicalHeightHintCache.begin(), m_logicalHeightHintCache.end());
-        }
         m_needsResolving = false;
     }
 }