aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge with develop

Browse Source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2016-11-19 13:44:22 +02:00
commit c614a2783e
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/vdxf/vdxfpaintdevice.cpp
View File

@ -142,6 +142,9 @@ int VDxfPaintDevice::metric(QPaintDevice::PaintDeviceMetric metric) const
return static_cast<int>(engine->getResolution()); return static_cast<int>(engine->getResolution());
#if QT_VERSION > QT_VERSION_CHECK(5, 0, 2) #if QT_VERSION > QT_VERSION_CHECK(5, 0, 2)
case QPaintDevice::PdmDevicePixelRatio: case QPaintDevice::PdmDevicePixelRatio:
#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
case QPaintDevice::PdmDevicePixelRatioScaled:
#endif
return 1; return 1;
#endif #endif
default: default:

3
src/libs/vobj/vobjpaintdevice.cpp
View File

@ -163,6 +163,9 @@ int VObjPaintDevice::metric(QPaintDevice::PaintDeviceMetric metric) const
return engine->getResolution(); return engine->getResolution();
#if QT_VERSION > QT_VERSION_CHECK(5, 0, 2) #if QT_VERSION > QT_VERSION_CHECK(5, 0, 2)
case QPaintDevice::PdmDevicePixelRatio: case QPaintDevice::PdmDevicePixelRatio:
#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
case QPaintDevice::PdmDevicePixelRatioScaled:
#endif
return 1; return 1;
#endif #endif
default: default: