diff options
author | Morten Johan Sørvig <morten.sorvig@theqtcompany.com> | 2015-11-12 16:22:14 +0100 |
---|---|---|
committer | BogDan Vatra <bogdan@kdab.com> | 2015-11-30 13:10:42 +0000 |
commit | e931ad71101585cf7826641f4c8e373c7b3119b9 (patch) | |
tree | bfeb438ae910c5fce8780579f2d6c164b9d693e5 /src | |
parent | 87d6b0514b21c18a9b0dfab1a735fdefa610af0a (diff) |
Don't use QT_AUTO_SCREEN_SCALE_FACTOR
With the addition of Qt::AA_EnableHighDpiScaling testing
of the env. variable only is no longer sufficient.
Use QHighDpiScaling::isActive() instead, which is
available at the time loadAndroidStyle is called.
Change-Id: Iaa6bbb5a04a71fa3bd68f3bdc8c8bcdfb5d1778f
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/platforms/android/qandroidplatformtheme.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformtheme.cpp b/src/plugins/platforms/android/qandroidplatformtheme.cpp index 71a3f910d2..5531910555 100644 --- a/src/plugins/platforms/android/qandroidplatformtheme.cpp +++ b/src/plugins/platforms/android/qandroidplatformtheme.cpp @@ -46,6 +46,7 @@ #include <QVariant> #include <private/qguiapplication_p.h> +#include <private/qhighdpiscaling_p.h> #include <qandroidplatformintegration.h> QT_BEGIN_NAMESPACE @@ -217,7 +218,7 @@ QJsonObject AndroidStyle::loadStyleData() static std::shared_ptr<AndroidStyle> loadAndroidStyle(QPalette *defaultPalette) { - double pixelDensity = qEnvironmentVariableIsSet("QT_AUTO_SCREEN_SCALE_FACTOR") ? QtAndroid::pixelDensity() : 1.0; + double pixelDensity = QHighDpiScaling::isActive() ? QtAndroid::pixelDensity() : 1.0; std::shared_ptr<AndroidStyle> style(new AndroidStyle); style->m_styleData = AndroidStyle::loadStyleData(); if (style->m_styleData.isEmpty()) |