Merge branch 'release/22.04'

[dolphin.git] / src / kitemviews / kstandarditemlistwidget.cpp

diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp
index e5c2f021bca0f7376a03f66fd1c581fd5f361bfe..db4e4a90ed8089998a8a9f3a510d98997bc68bb4 100644 (file)
--- a/src/kitemviews/kstandarditemlistwidget.cpp
+++ b/src/kitemviews/kstandarditemlistwidget.cpp
@@ -1107,7 +1107,7 @@ void KStandardItemListWidget::updatePixmapCache()
                 0;
 
         m_pixmapPos.setX(layoutDirection() == Qt::LeftToRight
-            ? x - iPadding - width + expansionOffset
+            ? x - iPadding - width
             : size().width() - iPadding - width - expansionOffset);
 
         // Derive icon's vertical center from the center of the text frame, including
@@ -1211,7 +1211,11 @@ QString KStandardItemListWidget::elideRightKeepExtension(const QString &text, in
             QString ret = m_customizedFontMetrics.elidedText(text.chopped(extensionLength),
                                                              Qt::ElideRight,
                                                              elidingWidth - extensionWidth);
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
             ret.append(text.rightRef(extensionLength));
+#else
+            ret.append(QStringView(text).right(extensionLength));
+#endif
             return ret;
         }
     }