From d5fb80ed874057da0d0b31b836052b9fa35ba269 Mon Sep 17 00:00:00 2001 From: Stephan Witt Date: Sat, 7 May 2016 09:56:03 +0200 Subject: [PATCH] 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. --- src/frontends/qt4/GuiApplication.cpp | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp index d64c9619fc..9c7c288fae 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); } -- 2.39.5