Re: [LyX/2.3-staging] Remove special code for Qt5 to manage HiDPI. It's not needed anymore and leads to strange icon scaling problems in mixed resolution environment. For reference see the screen shots in bug tracker ticket #10114.

[Guillaume Munch]

Which version of qt is this for? Here on Ubuntu we are still stuck with
5.5.1 for a little while. More generally what qt version is going to be
supported by 2.3 ?

Le 07/05/2016 08:56, Stephan Witt a écrit :

commit 1cd6633870c679d987e17e3901da3ac6a2873ab3
Author: Stephan Witt <sw...@lyx.org>
Date:   Sat May 7 09:56:03 2016 +0200

     Remove special code for Qt5 to manage HiDPI. It's not needed anymore and 
leads to strange icon scaling problems in mixed resolution environment.
     For reference see the screen shots in bug tracker ticket #10114.

diff --git a/src/frontends/qt4/GuiApplication.cpp 
b/src/frontends/qt4/GuiApplication.cpp
index d52fe56..4bc69a3 100644
--- 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);
  }