Merge remote-tracking branch 'origin/Applications/18.08'

This commit is contained in:
Albert Astals Cid 2018-10-02 21:30:37 +02:00
commit 3cdb348d1e

View file

@ -4905,7 +4905,7 @@ Document::OpenResult Document::openDocumentArchive( const QString & docFile, con
const QString tempFileName = d->m_archiveData->document.fileName();
QMimeDatabase db;
const QMimeType docMime = db.mimeTypeForFile( tempFileName, QMimeDatabase::MatchContent );
const QMimeType docMime = db.mimeTypeForFile( tempFileName, QMimeDatabase::MatchExtension );
const OpenResult ret = openDocument( tempFileName, url, docMime, password );
if ( ret != OpenSuccess )