From: Frank Reininghaus <frank78ac@googlemail.com>
Date: Wed, 21 May 2014 20:49:40 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into frameworks
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/a46121dc510f987f2d164b43eaf5f84ea8c83cb8

Merge remote-tracking branch 'origin/master' into frameworks

Conflicts:
	dolphin/src/search/filenamesearchprotocol.cpp
---

a46121dc510f987f2d164b43eaf5f84ea8c83cb8
diff --cc src/search/filenamesearchprotocol.cpp
index 3333dcc07,38dd26b23..b56a99580
--- a/src/search/filenamesearchprotocol.cpp
+++ b/src/search/filenamesearchprotocol.cpp
@@@ -92,11 -91,8 +92,8 @@@ void FileNameSearchProtocol::searchDire
          bool addItem = false;
          if (!m_regExp || item.name().contains(*m_regExp)) {
              addItem = true;
 -        } else if (m_checkContent && item.determineMimeType()->is(QLatin1String("text/plain"))) {
 +        } else if (m_checkContent && item.determineMimeType().inherits(QLatin1String("text/plain"))) {
-             qDebug() << "### Checking" << item;
              addItem = contentContainsPattern(item.url());
-         } else {
-             qDebug() << "### NOT Checking" << item;
          }
  
          if (addItem) {