feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Startup: Limit devicePixelRatio tweaking to Windows

Browse Source 
Setting DEVICE_PIXEL_RATIO on Linux to "auto" will disable font hinting
even on systems with a DPR of 1.

This patch limits our tweak to Windows. On OSX, it works reliably,
anyways.

Task-number: QTCREATORBUG-14516
Change-Id: I3c22c264c7f5019d22e1e3692b6d94c1d0777fc6
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Alessandro Portale
2015-06-04 12:38:12 +02:00
parent b4b902eb48
commit 7da2b4a3cb
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/main.cpp
View File

@@ -292,8 +292,10 @@ static inline QSettings *userSettings()
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
if (!qEnvironmentVariableIsSet("QT_DEVICE_PIXEL_RATIO")) if (Utils::HostOsInfo().isWindowsHost()
&& !qEnvironmentVariableIsSet("QT_DEVICE_PIXEL_RATIO")) {
qputenv("QT_DEVICE_PIXEL_RATIO", "auto"); qputenv("QT_DEVICE_PIXEL_RATIO", "auto");
}
QLoggingCategory::setFilterRules(QLatin1String("qtc.*.debug=false")); QLoggingCategory::setFilterRules(QLatin1String("qtc.*.debug=false"));
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
// increase the number of file that can be opened in Qt Creator. // increase the number of file that can be opened in Qt Creator.
@@ -306,7 +308,8 @@ int main(int argc, char **argv)
SharedTools::QtSingleApplication app((QLatin1String(appNameC)), argc, argv); SharedTools::QtSingleApplication app((QLatin1String(appNameC)), argc, argv);
if (!qFuzzyCompare(qApp->devicePixelRatio(), 1.0) if (Utils::HostOsInfo().isWindowsHost()
&& !qFuzzyCompare(qApp->devicePixelRatio(), 1.0)
&& QApplication::style()->objectName().startsWith( && QApplication::style()->objectName().startsWith(
QLatin1String("windows"), Qt::CaseInsensitive)) { QLatin1String("windows"), Qt::CaseInsensitive)) {
QApplication::setStyle(QLatin1String("fusion")); QApplication::setStyle(QLatin1String("fusion"));