From 5e3f52ef3b3ebd2c7f0061dcc27b5b18a6bf9178 Mon Sep 17 00:00:00 2001 From: Knud Dollereder Date: Wed, 4 Oct 2017 13:54:44 +0200 Subject: [PATCH] QMLDesigner: Fix Font size in form preview If QT_SCREEN_SCALE_FACTORS is set we cannot set QT_AUTO_SCREEN_SCALE_FACTOR. Otherwise, we mess up the font sizes. Change-Id: I7d1a07f4c671fdcae5a81556ab9e29df7ddf92d5 Reviewed-by: Tim Jenssen --- .../qmldesigner/designercore/instances/puppetcreator.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp index c5bb6e9d126..6937ece5c4a 100644 --- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp +++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp @@ -433,7 +433,8 @@ QProcessEnvironment PuppetCreator::processEnvironment() const environment.set(QLatin1String("QML_USE_MOCKUPS"), QLatin1String("true")); environment.set(QLatin1String("QML_PUPPET_MODE"), QLatin1String("true")); environment.set(QLatin1String("QML_DISABLE_DISK_CACHE"), QLatin1String("true")); - environment.set(QLatin1String("QT_AUTO_SCREEN_SCALE_FACTOR"), QLatin1String("1")); + if (!environment.hasKey("QT_SCREEN_SCALE_FACTORS")) + environment.set(QLatin1String("QT_AUTO_SCREEN_SCALE_FACTOR"), QLatin1String("1")); #ifndef QMLDESIGNER_TEST const QString controlsStyle = m_designerSettings.value(DesignerSettingsKey::