diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-26 03:04:11 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-26 03:04:11 +0100 |
| commit | 9048d08b7c3db48f428726fc42b80a36a5eccc97 (patch) | |
| tree | 9fe1b3220a1816f25900839499dac0abc43b8d05 | |
| parent | bf20fd49906e27e46c67e5c7a88ae9100308673d (diff) | |
| parent | 3c98af88f1051f6947cc6de1cfba57a1b1d6e0cd (diff) | |
| download | qtsvg-9048d08b7c3db48f428726fc42b80a36a5eccc97.tar.gz | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I24a15a5df1d8dc088c63da74cb5c1cdcf6cad411
| -rw-r--r-- | src/plugins/imageformats/svg/main.cpp | 5 | ||||
| -rw-r--r-- | src/svg/qsvgwidget.cpp | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/imageformats/svg/main.cpp b/src/plugins/imageformats/svg/main.cpp index f9fcfc3..d3fe476 100644 --- a/src/plugins/imageformats/svg/main.cpp +++ b/src/plugins/imageformats/svg/main.cpp @@ -72,10 +72,9 @@ QImageIOPlugin::Capabilities QSvgPlugin::capabilities(QIODevice *device, const Q if (format == "svg") #endif return Capabilities(CanRead); - if (!format.isEmpty()) - return 0; - Capabilities cap; + if (!format.isEmpty()) + return cap; if (device->isReadable() && QSvgIOHandler::canRead(device)) cap |= CanRead; return cap; diff --git a/src/svg/qsvgwidget.cpp b/src/svg/qsvgwidget.cpp index 4b86306..acc8cca 100644 --- a/src/svg/qsvgwidget.cpp +++ b/src/svg/qsvgwidget.cpp @@ -90,7 +90,7 @@ public: Constructs a new SVG display widget with the given \a parent. */ QSvgWidget::QSvgWidget(QWidget *parent) - : QWidget(*new QSvgWidgetPrivate, parent, 0) + : QWidget(*new QSvgWidgetPrivate, parent, {}) { d_func()->renderer = new QSvgRenderer(this); QObject::connect(d_func()->renderer, SIGNAL(repaintNeeded()), @@ -102,7 +102,7 @@ QSvgWidget::QSvgWidget(QWidget *parent) of the specified \a file. */ QSvgWidget::QSvgWidget(const QString &file, QWidget *parent) - : QWidget(*new QSvgWidgetPrivate, parent, 0) + : QWidget(*new QSvgWidgetPrivate, parent, {}) { d_func()->renderer = new QSvgRenderer(file, this); QObject::connect(d_func()->renderer, SIGNAL(repaintNeeded()), |