Merge branch 'master' into frameworks

diff --cc src/kitemviews/kitemlistview.cpp
index fed9b772949b132f34a2220400b18cc2d09549d7,756f9e39a41b7ef40585d39a7022a3b4d84f72a3..d35dd896e52a64fa403600038be63dc6a2593ead
--- 1/src/kitemviews/kitemlistview.cpp
--- 2/src/kitemviews/kitemlistview.cpp
+++ b/src/kitemviews/kitemlistview.cpp
@@@ -1338,17 -1332,20 +1338,21 @@@ void KItemListView::slotCurrentChanged(
  {
      Q_UNUSED(previous);
  
-     KItemListWidget* previousWidget = m_visibleItems.value(previous, 0);
-     if (previousWidget) {
-         previousWidget->setCurrent(false);
-     }
+     // In SingleSelection mode (e.g., in the Places Panel), the current item is
+     // always the selected item. It is not necessary to highlight the current item then.
+     if (m_controller->selectionBehavior() != KItemListController::SingleSelection) {
+         KItemListWidget* previousWidget = m_visibleItems.value(previous, 0);
+         if (previousWidget) {
+             previousWidget->setCurrent(false);
+         }
  
-     KItemListWidget* currentWidget = m_visibleItems.value(current, 0);
-     if (currentWidget) {
-         currentWidget->setCurrent(true);
+         KItemListWidget* currentWidget = m_visibleItems.value(current, 0);
+         if (currentWidget) {
+             currentWidget->setCurrent(true);
+         }
      }
 -    QAccessible::updateAccessibility(this, current+1, QAccessible::Focus);
 +#pragma message("TODO: port accessibility otherwise the following line asserts")
 +    //QAccessible::updateAccessibility(this, current+1, QAccessible::Focus);
  }
  
  void KItemListView::slotSelectionChanged(const KItemSet& current, const KItemSet& previous)

diff --cc src/kitemviews/kitemlistwidget.cpp
Simple merge

diff --cc src/kitemviews/kstandarditemlistwidget.cpp
Simple merge