From bdcd7a97449502f92069d36196cc81064b1c02a0 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Tue, 22 Aug 2017 15:35:16 +0200 Subject: Remove inaccurate statement about using setSize() from the documentation Change-Id: I9a18a0cfc86411336cbf29e0b7fb2f77f704d284 Reviewed-by: Eirik Aavitsland --- src/svg/qgraphicssvgitem.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/svg/qgraphicssvgitem.cpp b/src/svg/qgraphicssvgitem.cpp index f6b7c74..fe6e92e 100644 --- a/src/svg/qgraphicssvgitem.cpp +++ b/src/svg/qgraphicssvgitem.cpp @@ -123,9 +123,7 @@ public: \snippet src_svg_qgraphicssvgitem.cpp 0 - Size of the item can be set via the \l{QRectF::setSize()} - {setSize()} method of the \l{QGraphicsSvgItem::boundingRect()} - {bounding rectangle} or via direct manipulation of the items + Size of the item can be set via direct manipulation of the items transformation matrix. By default the SVG rendering is cached using QGraphicsItem::DeviceCoordinateCache -- cgit v1.2.1 From b839a0c2c483b59e3797f35aa1a81f3a3d072f72 Mon Sep 17 00:00:00 2001 From: Ales Erjavec Date: Tue, 12 Sep 2017 19:42:36 +0200 Subject: Return correct PdmDevicePixelRatioScaled metric QSvgGenerator::metric returned incorrect value for `PdmDevicePixelRatioScaled` resulting in degenerate `devicePixelRatioF()` return value. [ChangeLog][][QSvgGenerator] Report correct devicePixelRatioF Task-number: QTBUG-63159 Change-Id: Ib45e930b6b1b6d85aea5a68dd2b1b5f16a4eed3b Reviewed-by: Eirik Aavitsland --- src/svg/qsvggenerator.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/svg/qsvggenerator.cpp b/src/svg/qsvggenerator.cpp index 3f4e545..d294eb2 100644 --- a/src/svg/qsvggenerator.cpp +++ b/src/svg/qsvggenerator.cpp @@ -856,8 +856,9 @@ int QSvgGenerator::metric(QPaintDevice::PaintDeviceMetric metric) const case QPaintDevice::PdmPhysicalDpiY: return d->engine->resolution(); case QPaintDevice::PdmDevicePixelRatio: - case QPaintDevice::PdmDevicePixelRatioScaled: return 1; + case QPaintDevice::PdmDevicePixelRatioScaled: + return 1 * QPaintDevice::devicePixelRatioFScale(); default: qWarning("QSvgGenerator::metric(), unhandled metric %d\n", metric); break; -- cgit v1.2.1 From 2b4487a1c5fb4e7a6c942bf8c2fa995b6ea5ac01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Klitzing?= Date: Fri, 6 Oct 2017 13:33:16 +0200 Subject: Add missing emit Change-Id: I2a3c0a3734548919d8a337b88b9aa6fdf725bbc1 Reviewed-by: Friedemann Kleint --- src/svg/qsvgrenderer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/svg/qsvgrenderer.cpp b/src/svg/qsvgrenderer.cpp index bd0e6e3..d4ad373 100644 --- a/src/svg/qsvgrenderer.cpp +++ b/src/svg/qsvgrenderer.cpp @@ -304,7 +304,7 @@ int QSvgRenderer::animationDuration() const */ void QSvgRendererPrivate::callRepaintNeeded(QSvgRenderer *const q) { - q->repaintNeeded(); + emit q->repaintNeeded(); } template -- cgit v1.2.1 From 8241a99426d454c23a42640b781889adc820ba02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Klitzing?= Date: Fri, 6 Oct 2017 13:29:12 +0200 Subject: Remove unused variables Change-Id: I82fe38e2fbcc070d02d2acb34a43a8c971e84ae9 Reviewed-by: Friedemann Kleint Reviewed-by: Eirik Aavitsland --- src/svg/qsvggraphics.cpp | 1 - src/svg/qsvghandler.cpp | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/src/svg/qsvggraphics.cpp b/src/svg/qsvggraphics.cpp index 387136f..b1047eb 100644 --- a/src/svg/qsvggraphics.cpp +++ b/src/svg/qsvggraphics.cpp @@ -316,7 +316,6 @@ void QSvgText::draw(QPainter *p, QSvgExtraStates &states) bool appendSpace = false; QVector paragraphs; - QStack formats; QVector > formatRanges(1); paragraphs.push_back(QString()); diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp index 88d85e3..7841fa3 100644 --- a/src/svg/qsvghandler.cpp +++ b/src/svg/qsvghandler.cpp @@ -2308,7 +2308,6 @@ static bool parseAnimateColorNode(QSvgNode *parent, const QXmlStreamAttributes &attributes, QSvgHandler *handler) { - QString typeStr = attributes.value(QLatin1String("type")).toString(); QStringRef fromStr = attributes.value(QLatin1String("from")); QStringRef toStr = attributes.value(QLatin1String("to")); QString valuesStr = attributes.value(QLatin1String("values")).toString(); @@ -2393,7 +2392,6 @@ static bool parseAnimateTransformNode(QSvgNode *parent, QString values = attributes.value(QLatin1String("values")).toString(); QString beginStr = attributes.value(QLatin1String("begin")).toString(); QString durStr = attributes.value(QLatin1String("dur")).toString(); - QString targetStr = attributes.value(QLatin1String("attributeName")).toString(); QString repeatStr = attributes.value(QLatin1String("repeatCount")).toString(); QString fillStr = attributes.value(QLatin1String("fill")).toString(); QString fromStr = attributes.value(QLatin1String("from")).toString(); @@ -3197,14 +3195,6 @@ static QSvgNode *createSvgNode(QSvgNode *parent, { Q_UNUSED(parent); Q_UNUSED(attributes); - QString baseProfile = attributes.value(QLatin1String("baseProfile")).toString(); -#if 0 - if (baseProfile.isEmpty() && baseProfile != QLatin1String("tiny")) { - qCWarning(lcSvgHandler, "Profile is %s while we only support tiny!", - qPrintable(baseProfile)); - } -#endif - QSvgTinyDocument *node = new QSvgTinyDocument(); QString widthStr = attributes.value(QLatin1String("width")).toString(); QString heightStr = attributes.value(QLatin1String("height")).toString(); -- cgit v1.2.1 From 371316430e7f3100f6eff21cb05fd977c5cf39bc Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 6 Oct 2017 18:01:05 +0200 Subject: Bump version Change-Id: Ieb6391b41349f00e103b63f88f03fbf277be16c4 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index cf1e4e0..e795316 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.9.2 +MODULE_VERSION = 5.9.3 -- cgit v1.2.1 From 660012b62e62f6bf3a00e1194e7e22e41b7ffd8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Klitzing?= Date: Fri, 6 Oct 2017 13:37:43 +0200 Subject: Avoid possible detaching Change-Id: Iea5521d1fd53d5af21f99023f8d9ed15ef2f4f68 Reviewed-by: Friedemann Kleint --- src/svg/qsvggenerator.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/svg/qsvggenerator.cpp b/src/svg/qsvggenerator.cpp index d294eb2..8b9a9bd 100644 --- a/src/svg/qsvggenerator.cpp +++ b/src/svg/qsvggenerator.cpp @@ -228,9 +228,9 @@ public: QTextStream str(&d_func()->defs, QIODevice::Append); str << "" << endl; - for (QRect r : reg.rects()) { + const auto &rects = reg.rects(); + for (const QRect &r : rects) str << rct.arg(r.x()).arg(r.y()).arg(r.width()).arg(r.height()) << endl; - } str << QStringLiteral("") << endl << endl; d_func()->savedPatternMasks.append(maskId); } -- cgit v1.2.1 From faa5d4f0ddb17061c5d126243a46f2af7e91e9d9 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 28 Sep 2017 16:48:36 +0200 Subject: Fix outdated BSD license header Change-Id: I3917e7ab180b49c77bff0d071eca10f8bc7f33c7 Reviewed-by: Jani Heikkinen --- .../svg/draganddrop/delayedencoding/images/example.svg | 16 +++++++++++++--- examples/svg/draganddrop/delayedencoding/main.cpp | 16 +++++++++++++--- examples/svg/draganddrop/delayedencoding/mimedata.cpp | 16 +++++++++++++--- examples/svg/draganddrop/delayedencoding/mimedata.h | 16 +++++++++++++--- .../svg/draganddrop/delayedencoding/sourcewidget.cpp | 16 +++++++++++++--- examples/svg/draganddrop/delayedencoding/sourcewidget.h | 16 +++++++++++++--- examples/svg/embedded/fluidlauncher/pictureflow.cpp | 16 +++++++++++++--- examples/svg/embedded/fluidlauncher/pictureflow.h | 16 +++++++++++++--- examples/svg/network/bearercloud/bearercloud.cpp | 16 +++++++++++++--- examples/svg/network/bearercloud/bearercloud.h | 16 +++++++++++++--- examples/svg/network/bearercloud/cloud.cpp | 16 +++++++++++++--- examples/svg/network/bearercloud/cloud.h | 16 +++++++++++++--- examples/svg/network/bearercloud/main.cpp | 16 +++++++++++++--- examples/svg/opengl/framebufferobject/glwidget.cpp | 16 +++++++++++++--- examples/svg/opengl/framebufferobject/glwidget.h | 16 +++++++++++++--- examples/svg/opengl/framebufferobject/main.cpp | 16 +++++++++++++--- examples/svg/richtext/textobject/main.cpp | 16 +++++++++++++--- examples/svg/richtext/textobject/svgtextobject.cpp | 16 +++++++++++++--- examples/svg/richtext/textobject/svgtextobject.h | 16 +++++++++++++--- examples/svg/richtext/textobject/window.cpp | 16 +++++++++++++--- examples/svg/richtext/textobject/window.h | 16 +++++++++++++--- examples/svg/svggenerator/displaywidget.cpp | 16 +++++++++++++--- examples/svg/svggenerator/displaywidget.h | 16 +++++++++++++--- examples/svg/svggenerator/main.cpp | 16 +++++++++++++--- examples/svg/svggenerator/window.cpp | 16 +++++++++++++--- examples/svg/svggenerator/window.h | 16 +++++++++++++--- examples/svg/svgviewer/exportdialog.cpp | 16 +++++++++++++--- examples/svg/svgviewer/exportdialog.h | 16 +++++++++++++--- examples/svg/svgviewer/main.cpp | 16 +++++++++++++--- examples/svg/svgviewer/mainwindow.cpp | 16 +++++++++++++--- examples/svg/svgviewer/mainwindow.h | 16 +++++++++++++--- examples/svg/svgviewer/svgview.cpp | 16 +++++++++++++--- examples/svg/svgviewer/svgview.h | 16 +++++++++++++--- src/svg/doc/snippets/doc_src_qtsvg.cpp | 16 +++++++++++++--- src/svg/doc/snippets/doc_src_qtsvg.pro | 16 +++++++++++++--- src/svg/doc/snippets/src_svg_qgraphicssvgitem.cpp | 16 +++++++++++++--- 36 files changed, 468 insertions(+), 108 deletions(-) diff --git a/examples/svg/draganddrop/delayedencoding/images/example.svg b/examples/svg/draganddrop/delayedencoding/images/example.svg index c519933..978ac99 100644 --- a/examples/svg/draganddrop/delayedencoding/images/example.svg +++ b/examples/svg/draganddrop/delayedencoding/images/example.svg @@ -1,13 +1,23 @@