From af1061635a1582384e96f19f4a374c53cea0caeb Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 19 Nov 2016 10:07:02 +0200 Subject: [PATCH 1/2] Qt 5.6 new constant for SVG. --HG-- branch : develop --- src/libs/vdxf/vdxfpaintdevice.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/libs/vdxf/vdxfpaintdevice.cpp b/src/libs/vdxf/vdxfpaintdevice.cpp index f62e71153..80fcacc49 100644 --- a/src/libs/vdxf/vdxfpaintdevice.cpp +++ b/src/libs/vdxf/vdxfpaintdevice.cpp @@ -142,6 +142,9 @@ int VDxfPaintDevice::metric(QPaintDevice::PaintDeviceMetric metric) const return static_cast(engine->getResolution()); #if QT_VERSION > QT_VERSION_CHECK(5, 0, 2) case QPaintDevice::PdmDevicePixelRatio: +#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) + case QPaintDevice::PdmDevicePixelRatioScaled: +#endif return 1; #endif default: From 6b519092f684fd202c2f2c58737d9065e76c0cf9 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 19 Nov 2016 10:13:51 +0200 Subject: [PATCH 2/2] VObjPaintDevice new enum PdmDevicePixelRatioScaled. --HG-- branch : develop --- src/libs/vobj/vobjpaintdevice.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/libs/vobj/vobjpaintdevice.cpp b/src/libs/vobj/vobjpaintdevice.cpp index 62debacde..e1f42a50e 100644 --- a/src/libs/vobj/vobjpaintdevice.cpp +++ b/src/libs/vobj/vobjpaintdevice.cpp @@ -163,6 +163,9 @@ int VObjPaintDevice::metric(QPaintDevice::PaintDeviceMetric metric) const return engine->getResolution(); #if QT_VERSION > QT_VERSION_CHECK(5, 0, 2) case QPaintDevice::PdmDevicePixelRatio: +#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) + case QPaintDevice::PdmDevicePixelRatioScaled: +#endif return 1; #endif default: