diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 19:32:57 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 19:32:57 +0100 |
| commit | 86b82a0eea6c26fba34a9d2049935a18a088f3e7 (patch) | |
| tree | cfb16979ac42ca43d35a0687a77b325510674308 /src/plugins | |
| parent | 4ef60892ce9e8dea75a31b0be7895ebf473346a9 (diff) | |
| parent | a0363376cfbfd9359adbd2501dd087dfb0a4eb98 (diff) | |
| download | qtsvg-86b82a0eea6c26fba34a9d2049935a18a088f3e7.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I690e64f28de8d7a7768213f89858d3c19246fa08
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) |