summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Volkov <a.volkov@rusbitech.ru>2016-10-19 15:50:15 +0300
committerAlexander Volkov <a.volkov@rusbitech.ru>2016-11-10 13:57:00 +0000
commit4704ecbf79053f2e1cde3c869b03c769be6ef207 (patch)
tree961841b82dd88a777fa58a45cffc98bb6fc5c9b8
parent6d4eead2c5406b8cf23cf3648ea619338ac7f68a (diff)
downloadqtsvg-4704ecbf79053f2e1cde3c869b03c769be6ef207.tar.gz
Use separate metadata files for plugins if QT_NO_COMPRESS is defined
Change-Id: Ib15aa96c2ed84cf3ce9793385476f9fb3cacec8c Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
-rw-r--r--src/plugins/iconengines/svgiconengine/main.cpp4
-rw-r--r--src/plugins/iconengines/svgiconengine/qsvgiconengine-nocompress.json3
-rw-r--r--src/plugins/iconengines/svgiconengine/svgiconengine.pro1
-rw-r--r--src/plugins/imageformats/svg/main.cpp4
-rw-r--r--src/plugins/imageformats/svg/svg-nocompress.json4
5 files changed, 16 insertions, 0 deletions
diff --git a/src/plugins/iconengines/svgiconengine/main.cpp b/src/plugins/iconengines/svgiconengine/main.cpp
index 8822982..0eade5a 100644
--- a/src/plugins/iconengines/svgiconengine/main.cpp
+++ b/src/plugins/iconengines/svgiconengine/main.cpp
@@ -47,7 +47,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:
QStringList keys() const;
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
diff --git a/src/plugins/imageformats/svg/main.cpp b/src/plugins/imageformats/svg/main.cpp
index 8eb80b3..24a61b8 100644
--- a/src/plugins/imageformats/svg/main.cpp
+++ b/src/plugins/imageformats/svg/main.cpp
@@ -47,7 +47,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:
QStringList keys() const;
diff --git a/src/plugins/imageformats/svg/svg-nocompress.json b/src/plugins/imageformats/svg/svg-nocompress.json
new file mode 100644
index 0000000..3b5a653
--- /dev/null
+++ b/src/plugins/imageformats/svg/svg-nocompress.json
@@ -0,0 +1,4 @@
+{
+ "Keys": [ "svg" ],
+ "MimeTypes": [ "image/svg+xml" ]
+}