src/plugins/imageformats/svg/main.cpp
changeset 30 5dc02b23752f
parent 18 2f34d5167611
--- a/src/plugins/imageformats/svg/main.cpp	Wed Jun 23 19:07:03 2010 +0300
+++ b/src/plugins/imageformats/svg/main.cpp	Tue Jul 06 15:10:48 2010 +0300
@@ -62,26 +62,18 @@
 
 QStringList QSvgPlugin::keys() const
 {
-    return QStringList() << QLatin1String("svg");
+    return QStringList() << QLatin1String("svg") << QLatin1String("svgz");
 }
 
 QImageIOPlugin::Capabilities QSvgPlugin::capabilities(QIODevice *device, const QByteArray &format) const
 {
-    //### canRead disabled for now because it's hard to detect
-    //    whether the file is actually svg without parsing it
-    //if (device->isReadable() && QSvgIOHandler::canRead(device))
-
-    if (format == "svg")
+    if (format == "svg" || format == "svgz")
         return Capabilities(CanRead);
-    else
-        return 0;
-
-
-    if (!device->isOpen())
+    if (!format.isEmpty())
         return 0;
 
     Capabilities cap;
-    if (device->isReadable())
+    if (device->isReadable() && QSvgIOHandler::canRead(device))
         cap |= CanRead;
     return cap;
 }