Let's do this in a safe way while we wait for the release team to reply telling if...

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

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index d5b14783ba38035cc8560acc04ddbd36ce990077..c26d3d5b57f5c6710b09b9cebd8bc02113555a3b 100644 (file)
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -108,8 +108,14 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
     m_viewOptions.font = font;
     m_viewOptions.showDecorationSelected = true;
 
-    setVerticalScrollMode(QListView::ScrollPerPixel);
-    setHorizontalScrollMode(QListView::ScrollPerPixel);
+// TODO: Remove this check when 4.3.2 is released and KDE requires it... this
+//       check avoids a division by zero happening on versions before 4.3.1.
+//       Right now KDE in theory can be shipped with Qt 4.3.0 and above.
+//       ereslibre
+#if (QT_VERSION >= QT_VERSION_CHECK(4, 3, 2))
+    setVerticalScrollMode(QTreeView::ScrollPerPixel);
+    setHorizontalScrollMode(QTreeView::ScrollPerPixel);
+#endif
 
     updateDecorationSize();
 }
@@ -156,12 +162,18 @@ bool DolphinDetailsView::event(QEvent* event)
         hideColumn(DolphinModel::Rating);
         hideColumn(DolphinModel::Tags);
     }
+// TODO: Remove this check when 4.3.2 is released and KDE requires it... this
+//       check avoids a division by zero happening on versions before 4.3.1.
+//       Right now KDE in theory can be shipped with Qt 4.3.0 and above.
+//       ereslibre
+#if (QT_VERSION >= QT_VERSION_CHECK(4, 3, 2))
     else if (event->type() == QEvent::UpdateRequest) {
         // a wheel movement will scroll 4 items
         if (model()->rowCount() > 0) {
             verticalScrollBar()->setSingleStep((sizeHintForRow(0) / 3) * 4);
         }
     }
+#endif
 
     return QTreeView::event(event);
 }

diff --git a/src/sidebartreeview.cpp b/src/sidebartreeview.cpp
index 52f207a78f6d9a9cda286b9b68d01e31a8b8714f..2316c5d6e031f0c8ee1f9352c1a27d01d59ca85f 100644 (file)
--- a/src/sidebartreeview.cpp
+++ b/src/sidebartreeview.cpp
@@ -41,8 +41,15 @@ SidebarTreeView::SidebarTreeView(QWidget* parent) :
     setDragDropMode(QAbstractItemView::DragDrop);
     setDropIndicatorShown(false);
     setAutoExpandDelay(300);
+
+// TODO: Remove this check when 4.3.2 is released and KDE requires it... this
+//       check avoids a division by zero happening on versions before 4.3.1.
+//       Right now KDE in theory can be shipped with Qt 4.3.0 and above.
+//       ereslibre
+#if (QT_VERSION >= QT_VERSION_CHECK(4, 3, 2))
     setVerticalScrollMode(QListView::ScrollPerPixel);
     setHorizontalScrollMode(QListView::ScrollPerPixel);
+#endif
 
     viewport()->setAttribute(Qt::WA_Hover);
 
@@ -72,12 +79,18 @@ bool SidebarTreeView::event(QEvent* event)
         hideColumn(DolphinModel::Tags);
         header()->hide();
     }
+// TODO: Remove this check when 4.3.2 is released and KDE requires it... this
+//       check avoids a division by zero happening on versions before 4.3.1.
+//       Right now KDE in theory can be shipped with Qt 4.3.0 and above.
+//       ereslibre
+#if (QT_VERSION >= QT_VERSION_CHECK(4, 3, 2))
     else if (event->type() == QEvent::UpdateRequest) {
         // a wheel movement will scroll 1 item
         if (model()->rowCount() > 0) {
             verticalScrollBar()->setSingleStep(sizeHintForRow(0) / 3);
         }
     }
+#endif
 
     return QTreeView::event(event);
 }