Remove special code for Qt5 to manage HiDPI. It's not needed anymore and leads to...

For reference see the screen shots in bug tracker ticket #10114.

(cherry picked from commit d5fb80ed874057da0d0b31b836052b9fa35ba269)

diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index 375a6ac88a154198a9aaa0b0caa78dc3ec2c502e..afcd61176a7e5e1940a047b30a4f26ac229d5d9e 100644 (file)
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -553,18 +553,7 @@ QString iconName(FuncRequest const & f, bool unknown)
 
 bool getPixmap(QPixmap & pixmap, QString const & path)
 {
-       if (pixmap.load(path)) {
-#if QT_VERSION >= 0x050000
-               if (path.endsWith(".svgz") || path.endsWith(".svg") ) {
-                       GuiApplication const * guiApp = theGuiApp();
-                       if (guiApp != 0) {
-                               pixmap.setDevicePixelRatio(guiApp->pixelRatio());
-                       }
-               }
-#endif
-               return true;
-       }
-       return false;
+       return pixmap.load(path);
 }
 
 

diff --git a/status.22x b/status.22x
index d45997afca67fb53efec8bca7584f6af1e249da8..cc47a8a4daf6e63695a2ecb9feaf8f5f3de2e69e 100644 (file)
--- a/status.22x
+++ b/status.22x
@@ -176,6 +176,8 @@ What's new
 
 - Fix title of LuaTeX and XeTeX error dialogs (part of bug 10013).
 
+- Remove special code for Qt5 to load SVG icons with HiDPI (part of bug 10114).
+
 
 * INTERNALS