summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.cpp3
-rw-r--r--src/plugins/platforms/direct2d/qwindowsdirect2dpaintdevice.cpp3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.cpp
index 587bae3598..feb8f29214 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.cpp
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.cpp
@@ -65,8 +65,11 @@ public:
D2D1_BITMAP_PROPERTIES1 bitmapProperties() const
{
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED // see QTBUG-94043
FLOAT dpiX, dpiY;
QWindowsDirect2DContext::instance()->d2dFactory()->GetDesktopDpi(&dpiX, &dpiY);
+QT_WARNING_POP
return D2D1::BitmapProperties1(
D2D1_BITMAP_OPTIONS_TARGET,
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintdevice.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintdevice.cpp
index 3c86168a74..f624d5d2ba 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintdevice.cpp
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintdevice.cpp
@@ -103,6 +103,8 @@ int QWindowsDirect2DPaintDevice::metric(QPaintDevice::PaintDeviceMetric metric)
case QPaintDevice::PdmDpiX:
case QPaintDevice::PdmPhysicalDpiX:
{
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED // See QTBUG-94043
FLOAT x, y;
QWindowsDirect2DContext::instance()->d2dFactory()->GetDesktopDpi(&x, &y);
return qRound(x);
@@ -113,6 +115,7 @@ int QWindowsDirect2DPaintDevice::metric(QPaintDevice::PaintDeviceMetric metric)
FLOAT x, y;
QWindowsDirect2DContext::instance()->d2dFactory()->GetDesktopDpi(&x, &y);
return qRound(y);
+QT_WARNING_POP
}
case QPaintDevice::PdmDevicePixelRatio:
return 1;