Merge remote-tracking branch 'origin/release/20.12'

remotes/origin/work/aacid/new_clang_format_master
Albert Astals Cid 5 years ago
commit 9d0800a57a
  1. 4
      part/part.cpp

@ -1468,9 +1468,11 @@ bool Part::openFile()
}
if (mimes[0].inherits(QStringLiteral("text/plain"))) {
QMimeType contentMime = db.mimeTypeForFile(fileNameToOpen, QMimeDatabase::MatchContent);
const QMimeType contentMime = db.mimeTypeForFile(fileNameToOpen, QMimeDatabase::MatchContent);
if (contentMime.name() != QLatin1String("text/plain")) {
mimes.prepend(contentMime);
}
}
} else {
mimes << pathMime;
}

Loading…
Cancel
Save