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

Conflicts:
	dolphin/src/search/filenamesearchprotocol.cpp

diff --cc src/dolphinmainwindow.cpp
Simple merge

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

diff --cc src/panels/places/placesitem.cpp
Simple merge

diff --cc src/search/filenamesearchprotocol.cpp
index 3333dcc07238a7b941fa2de2ced045aadf1ddc65,38dd26b23181c11cc71f6b664453d263fe447770..b56a9958024832107c0a186422d048dd335ee193
--- 1/src/search/filenamesearchprotocol.cpp
--- 2/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) {

diff --cc src/settings/additionalinfodialog.cpp
Simple merge