From: Stephan Witt <switt@lyx.org>
Date: Sat, 7 May 2016 07:56:03 +0000 (+0200)
Subject: Remove special code for Qt5 to manage HiDPI. It's not needed anymore and leads to... 
X-Git-Tag: 2.2.1~25
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=ab1dd332e188b48b860af55be556c3da57c100c4;p=features.git

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.

(cherry picked from commit d5fb80ed874057da0d0b31b836052b9fa35ba269)
---

diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index 375a6ac88a..afcd61176a 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);
 }
 
 
diff --git a/status.22x b/status.22x
index d45997afca..cc47a8a4da 100644
--- 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