Merge branch 'KDE/4.12' into KDE/4.13

This commit is contained in:
Frank Reininghaus 2014-03-16 18:10:24 +01:00
commit dd18909eec

View file

@ -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) {