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

app: Adapt to Qt >= 6.2

Browse Source 
Change-Id: Ia27bccff16f0ba41e18c72ffd950b15e800fcf47
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2022-07-14 16:00:47 +02:00
parent 0108c48463
commit 2b3386908a
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/app/main.cpp
View File

@@ -287,15 +287,9 @@ static void setHighDpiEnvironmentVariable()
&& !qEnvironmentVariableIsSet("QT_AUTO_SCREEN_SCALE_FACTOR") && !qEnvironmentVariableIsSet("QT_AUTO_SCREEN_SCALE_FACTOR")
&& !qEnvironmentVariableIsSet("QT_SCALE_FACTOR") && !qEnvironmentVariableIsSet("QT_SCALE_FACTOR")
&& !qEnvironmentVariableIsSet("QT_SCREEN_SCALE_FACTORS")) { && !qEnvironmentVariableIsSet("QT_SCREEN_SCALE_FACTORS")) {
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
#endif
} else { } else {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
/* AA_DisableHighDpiScaling is deprecated */
QGuiApplication::setHighDpiScaleFactorRoundingPolicy( QGuiApplication::setHighDpiScaleFactorRoundingPolicy(
Qt::HighDpiScaleFactorRoundingPolicy::Floor); Qt::HighDpiScaleFactorRoundingPolicy::Floor);
#endif
} }
} }
@@ -478,14 +472,9 @@ int main(int argc, char **argv)
} }
} }
#if defined(Q_OS_WIN) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
if (!qEnvironmentVariableIsSet("QT_OPENGL"))
QCoreApplication::setAttribute(Qt::AA_UseOpenGLES);
#else
qputenv("QSG_RHI_BACKEND", "opengl"); qputenv("QSG_RHI_BACKEND", "opengl");
QGuiApplication::setHighDpiScaleFactorRoundingPolicy( QGuiApplication::setHighDpiScaleFactorRoundingPolicy(
Qt::HighDpiScaleFactorRoundingPolicy::Round); Qt::HighDpiScaleFactorRoundingPolicy::Round);
#endif
if (qEnvironmentVariableIsSet("QTCREATOR_DISABLE_NATIVE_MENUBAR") if (qEnvironmentVariableIsSet("QTCREATOR_DISABLE_NATIVE_MENUBAR")
|| qgetenv("XDG_CURRENT_DESKTOP").startsWith("Unity")) { || qgetenv("XDG_CURRENT_DESKTOP").startsWith("Unity")) {
@@ -596,11 +585,6 @@ int main(int argc, char **argv)
startCrashpad(libexecPath, crashReportingEnabled); startCrashpad(libexecPath, crashReportingEnabled);
#endif #endif
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
app.setAttribute(Qt::AA_UseHighDpiPixmaps);
app.setAttribute(Qt::AA_DisableWindowContextHelpButton);
#endif
PluginManager pluginManager; PluginManager pluginManager;
PluginManager::setPluginIID(QLatin1String("org.qt-project.Qt.QtCreatorPlugin")); PluginManager::setPluginIID(QLatin1String("org.qt-project.Qt.QtCreatorPlugin"));
PluginManager::setGlobalSettings(globalSettings); PluginManager::setGlobalSettings(globalSettings);