Merge branch '4.9'

2 files changed, 10 insertions, 1 deletions

diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp
index 8920fda67..5d6bdda9c 100644
--- a/src/kitemviews/kfileitemmodelrolesupdater.cpp
+++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp
@@ -214,7 +214,7 @@ bool KFileItemModelRolesUpdater::enlargeSmallPreviews() const
 
 void KFileItemModelRolesUpdater::setEnabledPlugins(const QStringList& list)
 {
-    if (m_enabledPlugins == list) {
+    if (m_enabledPlugins != list) {
         m_enabledPlugins = list;
         if (m_previewShown) {
             updateAllPreviews();
@@ -593,6 +593,13 @@ void KFileItemModelRolesUpdater::applyChangedNepomukRoles(const Nepomuk::Resourc
 #ifdef HAVE_NEPOMUK
     const KUrl itemUrl = m_nepomukUriItems.value(resource.resourceUri());
     const KFileItem item = m_model->fileItem(itemUrl);
+
+    if (item.isNull()) {
+        // itemUrl is not in the model anymore, probably because
+        // the corresponding file has been deleted in the meantime.
+        return;
+    }
+
     QHash<QByteArray, QVariant> data = rolesData(item);
 
     const KNepomukRolesProvider& rolesProvider = KNepomukRolesProvider::instance();
diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp
index f2ae37556..369906878 100644
--- a/src/kitemviews/kitemlistview.cpp
+++ b/src/kitemviews/kitemlistview.cpp
@@ -869,6 +869,8 @@ bool KItemListView::event(QEvent* event)
         event->accept();
         return true;
     }
+    // Make sure events unconsumed events get propagated up the chain. #302329
+    event->ignore();
     return QGraphicsWidget::event(event);
 }