Merge branch 'KDE/4.12' into KDE/4.13

diff --git a/src/search/filenamesearchprotocol.cpp b/src/search/filenamesearchprotocol.cpp
index 4d6f59fa4c608e92598a1465b80aedcbc94f343f..fd7f09a8806f5d04f526bb15c99d79f6647e2c4d 100644 (file)
--- a/src/search/filenamesearchprotocol.cpp
+++ b/src/search/filenamesearchprotocol.cpp
@@ -91,8 +91,11 @@ void FileNameSearchProtocol::searchDirectory(const KUrl& directory)
         bool addItem = false;
         if (!m_regExp || item.name().contains(*m_regExp)) {
             addItem = true;
-        } else if (m_checkContent && item.mimetype().startsWith(QLatin1String("text/"))) {
+        } else if (m_checkContent && item.determineMimeType()->is(QLatin1String("text/plain"))) {
+            qDebug() << "### Checking" << item;
             addItem = contentContainsPattern(item.url());
+        } else {
+            qDebug() << "### NOT Checking" << item;
         }
 
         if (addItem) {