Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
	.qmake.conf

Change-Id: I6429aa789e022fedababb8ec6bca144f7ce8721f

3 files changed, 5 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 <QtCore/qglobal.h>
 
-#ifndef QT_NO_WIDGETS
+#if !defined(QT_NO_GRAPHICSVIEW) && !defined(QT_NO_WIDGETS)
 
 #include <QtWidgets/qgraphicsitem.h>
 
@@ -88,6 +88,6 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_WIDGETS
+#endif // QT_NO_GRAPHICSVIEW or QT_NO_WIDGETS
 
 #endif // QGRAPHICSSVGITEM_H
diff --git a/src/svg/qsvggenerator.cpp b/src/svg/qsvggenerator.cpp
index a06170f..a282614 100644
--- a/src/svg/qsvggenerator.cpp
+++ b/src/svg/qsvggenerator.cpp
@@ -793,6 +793,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;