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

Merge remote-tracking branch 'origin/5.0'

Browse Source 
Conflicts:
	src/plugins/coreplugin/locator/executefilter.cpp

Change-Id: Iff5b82a9e491b782e4720138904f389d318b005c
This commit is contained in:
Eike Ziller
2021-08-11 10:10:51 +02:00
parent 7be290ec59 21cb0711c4
commit c7168d1063
104 changed files with 1405 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/main.cpp
View File

@@ -291,6 +291,13 @@ static void setHighDpiEnvironmentVariable()
QGuiApplication::setHighDpiScaleFactorRoundingPolicy(
Qt::HighDpiScaleFactorRoundingPolicy::Round);
#endif
#endif
} else {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
/* AA_DisableHighDpiScaling is deprecated */
QGuiApplication::setHighDpiScaleFactorRoundingPolicy(
Qt::HighDpiScaleFactorRoundingPolicy::Floor);
#endif
}
}
@@ -478,6 +485,8 @@ int main(int argc, char **argv)
QCoreApplication::setAttribute(Qt::AA_UseOpenGLES);
#else
qputenv("QSG_RHI_BACKEND", "opengl");
QGuiApplication::setHighDpiScaleFactorRoundingPolicy(
Qt::HighDpiScaleFactorRoundingPolicy::Round);
#endif
if (qEnvironmentVariableIsSet("QTCREATOR_DISABLE_NATIVE_MENUBAR")