Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 54d9ffb9 authored by Albert Astals Cid's avatar Albert Astals Cid

Merge remote-tracking branch 'origin/KDE/4.10'

Conflicts:
	VERSION
	core/version.h
	part.cpp
parents 91d4cc95 449861c1
......@@ -220,12 +220,15 @@ static QString compressedMimeFor( const QString& mime_to_check )
return it.value();
KMimeType::Ptr mime = KMimeType::mimeType( mime_to_check );
if ( mime->is( app_gzip ) )
return app_gzip;
else if ( supportBzip && mime->is( app_bzip ) )
return app_bzip;
else if ( supportXz && mime->is( app_xz ) )
return app_xz;
if ( mime )
{
if ( mime->is( app_gzip ) )
return app_gzip;
else if ( supportBzip && mime->is( app_bzip ) )
return app_bzip;
else if ( supportXz && mime->is( app_xz ) )
return app_xz;
}
return QString();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment