diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-26 12:56:04 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-26 12:56:04 +0100 |
| commit | 51ef7e2e9877fbcc8ac0f7dc4d2f17b767b7e765 (patch) | |
| tree | 5d93a54aa4245915d6fdc1dc3c8765d0dd2e8b6b /src/plugins/iconengines/svgiconengine/main.cpp | |
| parent | cb2aafdaa09e992982eb3aac318cfde38e65b2ac (diff) | |
| parent | 410b6b529cc6ee9236ee29fcdff4a03ad8670fe9 (diff) | |
| download | qtsvg-51ef7e2e9877fbcc8ac0f7dc4d2f17b767b7e765.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I43247261a4dc8badc4ad4f4d2137cdbd499f29db
Diffstat (limited to 'src/plugins/iconengines/svgiconengine/main.cpp')
| -rw-r--r-- | src/plugins/iconengines/svgiconengine/main.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/plugins/iconengines/svgiconengine/main.cpp b/src/plugins/iconengines/svgiconengine/main.cpp index ebcdc82..cedeb7a 100644 --- a/src/plugins/iconengines/svgiconengine/main.cpp +++ b/src/plugins/iconengines/svgiconengine/main.cpp @@ -51,22 +51,16 @@ 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: - QStringList keys() const; - QIconEngine *create(const QString &filename = QString()); + QIconEngine *create(const QString &filename = QString()) override; }; -QStringList QSvgIconPlugin::keys() const -{ - QStringList keys(QLatin1String("svg")); -#ifndef QT_NO_COMPRESS - keys << QLatin1String("svgz") << QLatin1String("svg.gz"); -#endif - return keys; -} - QIconEngine *QSvgIconPlugin::create(const QString &file) { QSvgIconEngine *engine = new QSvgIconEngine; |