The wrapping flag of QStyleOptionViewItemV2 gets lost, as the instance is assigned...

svn path=/trunk/KDE/kdebase/apps/; revision=664830

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index 9e5f14aa3842f1c53547148a386d29206c49be0c..6d2ca66a0c682638043e0650bd09aac82bde9524 100644 (file)
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -76,10 +76,8 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle
     font.setItalic(settings->italicFont());
     font.setBold(settings->boldFont());
     m_viewOptions.font = font;
-    if (settings->numberOfTextlines() > 1) {
-        m_viewOptions.features = QStyleOptionViewItemV2::WrapText;
-    }
 
+    setWordWrap(settings->numberOfTextlines() > 1);
     updateGridSize(controller->showPreview(), controller->showAdditionalInfo());
 
     if (settings->arrangement() == QListView::TopToBottom) {

diff --git a/src/dolphiniconsview.h b/src/dolphiniconsview.h
index 212ed3e787cdd8613a29b056f6b658dc517860d8..560d4976a5adbc88aa65e42275bf6caf9e0ea7ae 100644 (file)
--- a/src/dolphiniconsview.h
+++ b/src/dolphiniconsview.h
@@ -74,7 +74,7 @@ private:
 
 private:
     DolphinController* m_controller;
-    QStyleOptionViewItemV2 m_viewOptions;
+    QStyleOptionViewItem m_viewOptions;
 };
 
 #endif