From dd72a82e108c82cb8949517a8924c7fcb7b1e717 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 26 Nov 2014 10:03:41 +0100 Subject: Fix permissions of svg file Change-Id: I57aae43b317734d86201ef3ed797ac0a44c1fe6b Reviewed-by: Lars Knoll --- examples/svg/network/bearercloud/lan.svg | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 examples/svg/network/bearercloud/lan.svg diff --git a/examples/svg/network/bearercloud/lan.svg b/examples/svg/network/bearercloud/lan.svg old mode 100755 new mode 100644 -- cgit v1.2.1 From 5decb627d19ddb2b2aea4d7c317b9abfb86b5b8f Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Wed, 10 Dec 2014 11:20:36 +0100 Subject: Fix "unhandled metric 11" warning in QSvgGenerator::metric(). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit cea58f4b77e1639e5671cf424544d4948fb8e9ef introduced a new enum value that wasn't handled by the switch statement. Change-Id: I40a44cb7694f9a0f454bfadf014d09c67538daad Task-number: QTBUG-43197 Reviewed-by: Morten Johan Sørvig --- src/svg/qsvggenerator.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/svg/qsvggenerator.cpp b/src/svg/qsvggenerator.cpp index 5d58fa3..cf69b7f 100644 --- a/src/svg/qsvggenerator.cpp +++ b/src/svg/qsvggenerator.cpp @@ -791,6 +791,8 @@ int QSvgGenerator::metric(QPaintDevice::PaintDeviceMetric metric) const return d->engine->resolution(); case QPaintDevice::PdmPhysicalDpiY: return d->engine->resolution(); + case QPaintDevice::PdmDevicePixelRatio: + return 1; default: qWarning("QSvgGenerator::metric(), unhandled metric %d\n", metric); break; -- cgit v1.2.1 From a8cf84a30fd0701aff7b222dc365c29d4c4d4e08 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 12 Dec 2014 13:48:49 +0100 Subject: Bump version Change-Id: If61ced5c6a7b5f1a00aaf8c913be76665dfdede5 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 28e9cfd..f45945b 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += qt_example_installs CONFIG += warning_clean -MODULE_VERSION = 5.4.0 +MODULE_VERSION = 5.4.1 -- cgit v1.2.1 From 04e9f7f21a4c8faffdb342a141039096f00bb332 Mon Sep 17 00:00:00 2001 From: Ashish Kulkarni Date: Wed, 17 Dec 2014 12:37:27 +0530 Subject: fix build with QT_NO_GRAPHICSVIEW QGraphicsItem is not available if QT_NO_GRAPHICSVIEW is defined, but this was not checked when building QGraphicsSvgItem. Change-Id: I24b9f784d12a9ce4cbf5a4ffd22690c6441f6118 Reviewed-by: Friedemann Kleint Reviewed-by: aavit --- src/svg/qgraphicssvgitem.cpp | 2 +- src/svg/qgraphicssvgitem.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/svg/qgraphicssvgitem.cpp b/src/svg/qgraphicssvgitem.cpp index 642f793..4d2b916 100644 --- a/src/svg/qgraphicssvgitem.cpp +++ b/src/svg/qgraphicssvgitem.cpp @@ -32,7 +32,7 @@ ****************************************************************************/ #include "qgraphicssvgitem.h" -#ifndef QT_NO_WIDGETS +#if !defined(QT_NO_GRAPHICSVIEW) && !defined(QT_NO_WIDGETS) #include "qpainter.h" #include "qstyleoption.h" diff --git a/src/svg/qgraphicssvgitem.h b/src/svg/qgraphicssvgitem.h index 1626131..8af0d1e 100644 --- a/src/svg/qgraphicssvgitem.h +++ b/src/svg/qgraphicssvgitem.h @@ -35,7 +35,7 @@ #include -#ifndef QT_NO_WIDGETS +#if !defined(QT_NO_GRAPHICSVIEW) && !defined(QT_NO_WIDGETS) #include @@ -88,6 +88,6 @@ private: QT_END_NAMESPACE -#endif // QT_NO_WIDGETS +#endif // QT_NO_GRAPHICSVIEW or QT_NO_WIDGETS #endif // QGRAPHICSSVGITEM_H -- cgit v1.2.1