diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:43:42 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:43:42 +0200 |
commit | ca030597815daad554450384e8fa87d3d256bbaf (patch) | |
tree | a9f22ddde8cbd5bb5b6f1a470ffdc76cff65f3a3 /src/plugins | |
parent | 965cdb2f87e5d22950a7cd5434e2d80a2fbe6cf9 (diff) | |
parent | 612c3041475550837dee7149b9f5e9e4f55c17a0 (diff) | |
download | qtsvg-ca030597815daad554450384e8fa87d3d256bbaf.tar.gz |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I8226348c242d0d5bf1f78adc376ecbe26215445e
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/iconengines/svgiconengine/svgiconengine.pro | 10 | ||||
-rw-r--r-- | src/plugins/imageformats/svg/svg.pro | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/iconengines/svgiconengine/svgiconengine.pro b/src/plugins/iconengines/svgiconengine/svgiconengine.pro index 516142b..eb6847b 100644 --- a/src/plugins/iconengines/svgiconengine/svgiconengine.pro +++ b/src/plugins/iconengines/svgiconengine/svgiconengine.pro @@ -1,12 +1,12 @@ TARGET = qsvgicon -PLUGIN_TYPE = iconengines -PLUGIN_EXTENDS = svg -PLUGIN_CLASS_NAME = QSvgIconPlugin -load(qt_plugin) - HEADERS += qsvgiconengine.h SOURCES += main.cpp \ qsvgiconengine.cpp OTHER_FILES += qsvgiconengine.json QT += svg core-private gui-private + +PLUGIN_TYPE = iconengines +PLUGIN_EXTENDS = svg +PLUGIN_CLASS_NAME = QSvgIconPlugin +load(qt_plugin) diff --git a/src/plugins/imageformats/svg/svg.pro b/src/plugins/imageformats/svg/svg.pro index ce1881f..9db6a9a 100644 --- a/src/plugins/imageformats/svg/svg.pro +++ b/src/plugins/imageformats/svg/svg.pro @@ -1,11 +1,11 @@ TARGET = qsvg -PLUGIN_TYPE = imageformats -PLUGIN_EXTENDS = svg -PLUGIN_CLASS_NAME = QSvgPlugin -load(qt_plugin) - HEADERS += qsvgiohandler.h SOURCES += main.cpp \ qsvgiohandler.cpp QT += svg + +PLUGIN_TYPE = imageformats +PLUGIN_EXTENDS = svg +PLUGIN_CLASS_NAME = QSvgPlugin +load(qt_plugin) |