diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-11-27 11:56:10 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-11-30 05:59:51 +0000 |
| commit | fc478d1ef7fad638a25a2e4cd1bd73d85859be20 (patch) | |
| tree | 3556d9c7ad14e17dad2df4a95355043094a74a6c | |
| parent | e84e85dd4c59f2c79f81ba4d8d7f04397eb0003c (diff) | |
Update setHighDpiScaleFactorRoundingPolicy docs
The default is now passthrough. And let's not mention the
environment variable overrides, as they are meant for internal
testing.
Change-Id: Ie2409e5411d4bdcdf041834cb5ca9e1215aa173a
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
(cherry picked from commit 58afadc624cf284cfe93d6a5c85557ed6e4f9765)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 3 | ||||
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 9 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index fae3afddc1..4aded8643e 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -3238,8 +3238,7 @@ decide how non-integer scale factors (such as Windows 150%) are handled. The active policy is set by calling QGuiApplication::setHighDdpiScaleFactorRoundingPolicy() before - the application object is created, or by setting the QT_SCALE_FACTOR_ROUNDING_POLICY - environment variable. + the application object is created. \sa QGuiApplication::setHighDpiScaleFactorRoundingPolicy() diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 05933bac6a..c10b95e206 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -3633,14 +3633,11 @@ Qt::ApplicationState QGuiApplication::applicationState() ("small UI") or as 2x ("large UI"). See the Qt::HighDpiScaleFactorRoundingPolicy enum for a complete list of all options. - This function must be called before creating the application object, - and can be overridden by setting the QT_SCALE_FACTOR_ROUNDING_POLICY - environment variable. The QGuiApplication::highDpiScaleFactorRoundingPolicy() + This function must be called before creating the application object. + The QGuiApplication::highDpiScaleFactorRoundingPolicy() accessor will reflect the environment, if set. - The default value is Qt::HighDpiScaleFactorRoundingPolicy::Round. - On Qt for Android the default is Qt::HighDpiScaleFactorRoundingPolicy::PassThrough, - which preserves historical behavior from earlier Qt versions. + The default value is Qt::HighDpiScaleFactorRoundingPolicy::PassThrough. */ void QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy policy) { |