Redo the fix for CTRL+Tab not working when using Dolphin's filemanagement part

in Konqueror. The original fix, commit 4f7ed2b, prevents drag and drop from
working correctly.

CCBUG: 302329
REVIEW: 106569

diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp
index 5a7175e4ccc628617aedbd353c97299c4d645e24..df940de7dab3d63db878a081ad80081f47d90b41 100644 (file)
--- a/src/kitemviews/kitemlistcontroller.cpp
+++ b/src/kitemviews/kitemlistcontroller.cpp
@@ -419,6 +419,8 @@ bool KItemListController::keyPressEvent(QKeyEvent* event)
 
     default:
         m_keyboardManager->addKeys(event->text());
 
     default:
         m_keyboardManager->addKeys(event->text());

+        // Make sure unconsumed events get propagated up the chain. #302329
+        event->ignore();

         return false;
     }
 
         return false;
     }
 

diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp
index 05f2f697fe3a38ebbe80598cb8f348b2827b3afe..72b3fd8fcbfbaa43660fac359320c8227ade9063 100644 (file)
--- a/src/kitemviews/kitemlistview.cpp
+++ b/src/kitemviews/kitemlistview.cpp
@@ -846,8 +846,6 @@ bool KItemListView::event(QEvent* event)
         event->accept();
         return true;
     }
         event->accept();
         return true;
     }

-    // Make sure events unconsumed events get propagated up the chain. #302329
-    event->ignore();

     return QGraphicsWidget::event(event);
 }
 
     return QGraphicsWidget::event(event);
 }