From 357f198c1e696538b38af1086e4af65d953ac237 Mon Sep 17 00:00:00 2001 From: Gilbert Assaf Date: Wed, 31 May 2017 12:54:25 +0200 Subject: [PATCH] kio_msits emits mimetype again kio_msits emitting mimetype function ported to QT5. A kio slave should always emit the mimetype (see kio slave api doc). Reviewed at https://git.reviewboard.kde.org/r/130113/ --- generators/chm/kio-msits/msits.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/generators/chm/kio-msits/msits.cpp b/generators/chm/kio-msits/msits.cpp index 0a53e0c9d..50bac0c10 100644 --- a/generators/chm/kio-msits/msits.cpp +++ b/generators/chm/kio-msits/msits.cpp @@ -123,13 +123,13 @@ void ProtocolMSITS::get( const QUrl& url ) } totalSize( buf.size() ); -#if 0 //PORT QT5 + QMimeDatabase db; - QMimeType result = db.mimeTypeForNameAndData( fileName, buf ); + QMimeType result = db.mimeTypeForFileNameAndData( fileName, buf ); qCDebug(KIO_MITS_LOG) << "Emitting mimetype " << result.name(); - mimeType( result.name() ); -#endif + mimeType( result.name() ); + data( buf ); processedSize( buf.size() );