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/iconengines | |
| 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/iconengines')
3 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/iconengines/svgiconengine/main.cpp b/src/plugins/iconengines/svgiconengine/main.cpp index 8c3f8bb..cedeb7a 100644 --- a/src/plugins/iconengines/svgiconengine/main.cpp +++ b/src/plugins/iconengines/svgiconengine/main.cpp @@ -51,7 +51,11 @@ QT_BEGIN_NAMESPACE class QSvgIconPlugin : public QIconEnginePlugin { Q_OBJECT +#ifndef QT_NO_COMPRESS Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QIconEngineFactoryInterface" FILE "qsvgiconengine.json") +#else + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QIconEngineFactoryInterface" FILE "qsvgiconengine-nocompress.json") +#endif public: QIconEngine *create(const QString &filename = QString()) override; diff --git a/src/plugins/iconengines/svgiconengine/qsvgiconengine-nocompress.json b/src/plugins/iconengines/svgiconengine/qsvgiconengine-nocompress.json new file mode 100644 index 0000000..a3e1ac3 --- /dev/null +++ b/src/plugins/iconengines/svgiconengine/qsvgiconengine-nocompress.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "svg" ] +} diff --git a/src/plugins/iconengines/svgiconengine/svgiconengine.pro b/src/plugins/iconengines/svgiconengine/svgiconengine.pro index eb6847b..bfc739f 100644 --- a/src/plugins/iconengines/svgiconengine/svgiconengine.pro +++ b/src/plugins/iconengines/svgiconengine/svgiconengine.pro @@ -4,6 +4,7 @@ HEADERS += qsvgiconengine.h SOURCES += main.cpp \ qsvgiconengine.cpp OTHER_FILES += qsvgiconengine.json +OTHER_FILES += qsvgiconengine-nocompress.json QT += svg core-private gui-private PLUGIN_TYPE = iconengines |