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 d5fb80ed87)
This commit is contained in:
Stephan Witt 2016-05-07 09:56:03 +02:00
parent 9bc0d8a8de
commit ab1dd332e1
2 changed files with 3 additions and 12 deletions

View File

@ -553,18 +553,7 @@ QString iconName(FuncRequest const & f, bool unknown)
bool getPixmap(QPixmap & pixmap, QString const & path) bool getPixmap(QPixmap & pixmap, QString const & path)
{ {
if (pixmap.load(path)) { return 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;
} }

View File

@ -176,6 +176,8 @@ What's new
- Fix title of LuaTeX and XeTeX error dialogs (part of bug 10013). - 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 * INTERNALS