Backport PR #17640: More qt fractional DPI fixes

story645 · tacaswell · commit ff32cc7428b8 · 2020-06-16T00:37:40.000-04:00
Merge pull request #17640 from QuLogic/more-pyqt5-fixes More qt fractional DPI fixes
diff --git a/lib/matplotlib/backends/backend_qt5.py b/lib/matplotlib/backends/backend_qt5.py
@@ -18,7 +18,7 @@
 from . import qt_compat
 from .qt_compat import (
     QtCore, QtGui, QtWidgets, _isdeleted, _getSaveFileName,
-    is_pyqt5, __version__, QT_API,
+    is_pyqt5, __version__, QT_API, _setDevicePixelRatioF,
     _devicePixelRatioF)
 
 
@@ -681,7 +681,7 @@ def _icon(self, name, color=None):
         if is_pyqt5():
             name = name.replace('.png', '_large.png')
         pm = QtGui.QPixmap(os.path.join(self.basedir, name))
-        qt_compat._setDevicePixelRatioF(pm, _devicePixelRatioF(self))
+        _setDevicePixelRatioF(pm, _devicePixelRatioF(self))
         if color is not None:
             mask = pm.createMaskFromColor(QtGui.QColor('black'),
                                           QtCore.Qt.MaskOutColor)
diff --git a/lib/matplotlib/backends/qt_compat.py b/lib/matplotlib/backends/qt_compat.py
@@ -205,6 +205,6 @@ def _setDevicePixelRatioF(obj, val):
     if hasattr(obj, 'setDevicePixelRatioF'):
         # Not available on Qt<5.6
         obj.setDevicePixelRatioF(val)
-    if hasattr(obj, 'setDevicePixelRatio'):
+    elif hasattr(obj, 'setDevicePixelRatio'):
         # Not available on Qt4 or some older Qt5.
         obj.setDevicePixelRatio(val)
