diff --git a/lib/mimetypeutils.cpp b/lib/mimetypeutils.cpp --- a/lib/mimetypeutils.cpp +++ b/lib/mimetypeutils.cpp @@ -67,7 +67,6 @@ { // need to invent more intelligent way to whitelist raws *list += QStringLiteral("image/x-nikon-nef"); - *list += QStringLiteral("image/x-nikon-nrw"); *list += QStringLiteral("image/x-canon-cr2"); *list += QStringLiteral("image/x-canon-crw"); *list += QStringLiteral("image/x-pentax-pef"); @@ -78,7 +77,6 @@ *list += QStringLiteral("image/x-panasonic-raw2"); *list += QStringLiteral("image/x-panasonic-rw"); *list += QStringLiteral("image/x-panasonic-rw2"); - *list += QStringLiteral("image/x-samsung-srw"); *list += QStringLiteral("image/x-olympus-orf"); *list += QStringLiteral("image/x-fuji-raf"); *list += QStringLiteral("image/x-kodak-dcr"); diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -10,7 +10,6 @@ endmacro(gv_add_unit_test) kde_source_files_enable_exceptions( - documenttest.cpp imagemetainfomodeltest.cpp ) diff --git a/tests/auto/documenttest.h b/tests/auto/documenttest.h --- a/tests/auto/documenttest.h +++ b/tests/auto/documenttest.h @@ -128,6 +128,7 @@ void testCheckDocumentEditor(); void testUndoStackPush(); void testUndoRedo(); + void testOpenDialogMimeTypesFilter(); void initTestCase(); void init(); diff --git a/tests/auto/documenttest.cpp b/tests/auto/documenttest.cpp --- a/tests/auto/documenttest.cpp +++ b/tests/auto/documenttest.cpp @@ -20,6 +20,7 @@ // Qt #include #include +#include #include // KDE @@ -39,8 +40,6 @@ #include "../lib/transformimageoperation.h" #include "testutils.h" -#include - #include "documenttest.h" QTEST_MAIN(DocumentTest) @@ -892,3 +891,13 @@ QCOMPARE(doc->undoStack()->count(), 1); QVERIFY(doc->undoStack()->isClean()); } + +void DocumentTest::testOpenDialogMimeTypesFilter() +{ + const QStringList mimeTypes = MimeTypeUtils::imageMimeTypes(); + QMimeDatabase mdb; + for (const auto &s : mimeTypes) { + const QMimeType mt = mdb.mimeTypeForName(s); + QVERIFY(mt.isValid()); + } +}