aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2020-11-23 19:20:23 +0100
committerJarek Kobus <jaroslaw.kobus@qt.io>2020-11-27 11:13:11 +0000
commita0dd5d2b4fdbf6704240265cc4717e2f8ef9c24e (patch)
tree1dd78d987a2c9ec23573cff0ed23fbd19da48122
parentb801fc7ae7365701980d9da3d7ffeef50a3b291c (diff)
Fix a warning about using deprecated Qt::AA_EnableHighDpiScaling
Task-number: QTCREATORBUG-24098 Change-Id: Ieb58a74e32fd55d95a701299f831d073ebbf4f8e Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r--src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp
index df609f4cb0..743d3051d7 100644
--- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp
@@ -458,8 +458,12 @@ QProcessEnvironment PuppetCreator::processEnvironment() const
environment.set("QML_BAD_GUI_RENDER_LOOP", "true");
environment.set("QML_PUPPET_MODE", "true");
environment.set("QML_DISABLE_DISK_CACHE", "true");
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
if (!environment.hasKey("QT_SCREEN_SCALE_FACTORS") && !environment.hasKey("QT_SCALE_FACTOR")
&& QApplication::testAttribute(Qt::AA_EnableHighDpiScaling))
+#else
+ if (!environment.hasKey("QT_SCREEN_SCALE_FACTORS") && !environment.hasKey("QT_SCALE_FACTOR"))
+#endif
environment.set("QT_AUTO_SCREEN_SCALE_FACTOR", "1");
#ifndef QMLDESIGNER_TEST