diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-15 17:47:06 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-15 18:01:49 +0200 |
| commit | 46a4d2b1b7d74c7aff3e07606a38b8cd8a953f12 (patch) | |
| tree | db82d081dfabd73bb502ba8224a01e1c98cff736 /src/plugins | |
| parent | 1e3d6f28c0fa18a187c6b0986f1b9db22b4fdf0a (diff) | |
| parent | 24a7b41822333f33c2ec5027795e265a5ad0d350 (diff) | |
| download | qtsvg-46a4d2b1b7d74c7aff3e07606a38b8cd8a953f12.tar.gz | |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I886cfdcd8bd124a02c54f23b694799610f60d7bd
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/iconengines/svgiconengine/CMakeLists.txt | 19 | ||||
| -rw-r--r-- | src/plugins/imageformats/svg/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | src/plugins/imageformats/svg/qsvgiohandler.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/imageformats/svg/qsvgiohandler.h | 2 |
4 files changed, 26 insertions, 13 deletions
diff --git a/src/plugins/iconengines/svgiconengine/CMakeLists.txt b/src/plugins/iconengines/svgiconengine/CMakeLists.txt index 4bbb188..4b047be 100644 --- a/src/plugins/iconengines/svgiconengine/CMakeLists.txt +++ b/src/plugins/iconengines/svgiconengine/CMakeLists.txt @@ -6,17 +6,22 @@ add_qt_plugin(qsvgicon TYPE iconengines + CLASS_NAME QSvgIconPlugin SOURCES main.cpp qsvgiconengine.cpp qsvgiconengine.h - PUBLIC_LIBRARIES - Qt::Svg LIBRARIES Qt::CorePrivate Qt::GuiPrivate - - # OTHER_FILES = "qsvgiconengine.json" "qsvgiconengine-nocompress.json" - # PLUGIN_CLASS_NAME = "QSvgIconPlugin" - # PLUGIN_EXTENDS = "svg" - # _LOADED = "qt_plugin" + PUBLIC_LIBRARIES + Qt::Core + Qt::Gui + Qt::Svg ) + +#### Keys ignored in scope 1:.:.:svgiconengine.pro:<TRUE>: +# OTHER_FILES = "qsvgiconengine.json" "qsvgiconengine-nocompress.json" +# PLUGIN_CLASS_NAME = "QSvgIconPlugin" +# PLUGIN_EXTENDS = "svg" +# PLUGIN_TYPE = "iconengines" +# _LOADED = "qt_plugin" diff --git a/src/plugins/imageformats/svg/CMakeLists.txt b/src/plugins/imageformats/svg/CMakeLists.txt index cef8f5b..66a255c 100644 --- a/src/plugins/imageformats/svg/CMakeLists.txt +++ b/src/plugins/imageformats/svg/CMakeLists.txt @@ -6,12 +6,18 @@ add_qt_plugin(qsvg TYPE imageformats + CLASS_NAME QSvgPlugin SOURCES main.cpp qsvgiohandler.cpp qsvgiohandler.h - LIBRARIES + PUBLIC_LIBRARIES + Qt::Core + Qt::Gui Qt::Svg - # PLUGIN_CLASS_NAME = "QSvgPlugin" - # PLUGIN_EXTENDS = "svg" - # _LOADED = "qt_plugin" ) + +#### Keys ignored in scope 1:.:.:svg.pro:<TRUE>: +# PLUGIN_CLASS_NAME = "QSvgPlugin" +# PLUGIN_EXTENDS = "svg" +# PLUGIN_TYPE = "imageformats" +# _LOADED = "qt_plugin" diff --git a/src/plugins/imageformats/svg/qsvgiohandler.cpp b/src/plugins/imageformats/svg/qsvgiohandler.cpp index a999d47..6999d51 100644 --- a/src/plugins/imageformats/svg/qsvgiohandler.cpp +++ b/src/plugins/imageformats/svg/qsvgiohandler.cpp @@ -140,12 +140,12 @@ bool QSvgIOHandler::canRead() const return false; } - +#if QT_DEPRECATED_SINCE(5, 13) QByteArray QSvgIOHandler::name() const { return "svg"; } - +#endif bool QSvgIOHandler::read(QImage *image) { diff --git a/src/plugins/imageformats/svg/qsvgiohandler.h b/src/plugins/imageformats/svg/qsvgiohandler.h index fdafa0a..5fdf6ee 100644 --- a/src/plugins/imageformats/svg/qsvgiohandler.h +++ b/src/plugins/imageformats/svg/qsvgiohandler.h @@ -58,7 +58,9 @@ public: QSvgIOHandler(); ~QSvgIOHandler(); bool canRead() const override; +#if QT_DEPRECATED_SINCE(5, 13) QByteArray name() const override; +#endif bool read(QImage *image) override; static bool canRead(QIODevice *device); QVariant option(ImageOption option) const override; |