summaryrefslogtreecommitdiff
path: root/src/svg/qsvggenerator.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-05-24 11:10:23 +0200
committerLiang Qi <liang.qi@qt.io>2016-05-24 11:10:35 +0200
commit414562f60b8b8aa7904fbc37475938d696a96829 (patch)
tree33ca185a025b9a49af1625c0f4e6ae3a6979ccec /src/svg/qsvggenerator.cpp
parent72df268b0cf6933c6893862fbe2e52f8cf6772db (diff)
parentb231d9f41903f8514a2d91844f4515055307af3a (diff)
downloadqtsvg-414562f60b8b8aa7904fbc37475938d696a96829.tar.gz
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I02f07888db8531778c1e28aa3da6d2166c7b8c8a
Diffstat (limited to 'src/svg/qsvggenerator.cpp')
-rw-r--r--src/svg/qsvggenerator.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/svg/qsvggenerator.cpp b/src/svg/qsvggenerator.cpp
index 468b97f..0abd403 100644
--- a/src/svg/qsvggenerator.cpp
+++ b/src/svg/qsvggenerator.cpp
@@ -798,6 +798,7 @@ int QSvgGenerator::metric(QPaintDevice::PaintDeviceMetric metric) const
case QPaintDevice::PdmPhysicalDpiY:
return d->engine->resolution();
case QPaintDevice::PdmDevicePixelRatio:
+ case QPaintDevice::PdmDevicePixelRatioScaled:
return 1;
default:
qWarning("QSvgGenerator::metric(), unhandled metric %d\n", metric);