Merge with develop
--HG-- branch : feature
This commit is contained in:
commit
c614a2783e
|
@ -142,6 +142,9 @@ int VDxfPaintDevice::metric(QPaintDevice::PaintDeviceMetric metric) const
|
|||
return static_cast<int>(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:
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue
Block a user