mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-12 12:54:29 +00:00
Merge branch 'KDE/4.12' into KDE/4.13
This commit is contained in:
commit
dd18909eec
|
@ -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) {
|
||||
|
|
Loading…
Reference in a new issue