diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-24 19:37:11 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-24 19:37:11 +0100 |
| commit | 410b6b529cc6ee9236ee29fcdff4a03ad8670fe9 (patch) | |
| tree | d75f2ff444e4b174938a3e073f47c6d1d7c60cc7 /src/plugins/imageformats/svg/main.cpp | |
| parent | 83fe59a86cceb94695ac85211b4ededb08bc5949 (diff) | |
| parent | 4704ecbf79053f2e1cde3c869b03c769be6ef207 (diff) | |
| download | qtsvg-410b6b529cc6ee9236ee29fcdff4a03ad8670fe9.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.75.7
Change-Id: Ibcca419da389fc7538ee050de7c59e8b400e1978
Diffstat (limited to 'src/plugins/imageformats/svg/main.cpp')
| -rw-r--r-- | src/plugins/imageformats/svg/main.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/imageformats/svg/main.cpp b/src/plugins/imageformats/svg/main.cpp index e92f25a..f9fcfc3 100644 --- a/src/plugins/imageformats/svg/main.cpp +++ b/src/plugins/imageformats/svg/main.cpp @@ -53,7 +53,11 @@ QT_BEGIN_NAMESPACE class QSvgPlugin : public QImageIOPlugin { Q_OBJECT +#ifndef QT_NO_COMPRESS Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "svg.json") +#else + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "svg-nocompress.json") +#endif public: Capabilities capabilities(QIODevice *device, const QByteArray &format) const override; @@ -62,7 +66,11 @@ public: QImageIOPlugin::Capabilities QSvgPlugin::capabilities(QIODevice *device, const QByteArray &format) const { +#ifndef QT_NO_COMPRESS if (format == "svg" || format == "svgz") +#else + if (format == "svg") +#endif return Capabilities(CanRead); if (!format.isEmpty()) return 0; |