diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-07 18:51:21 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-07 18:51:21 +0200 |
| commit | 42aaff003d27ed9ba75d48a4e02a83fd5c1eade9 (patch) | |
| tree | 2c8a5d2ec58e7be3c3af51f88cf6d05864df6f34 /src/imports/controls/doc/src/qtquickcontrols2-highdpi.qdoc | |
| parent | 6b55e00eb94b138f39becac1bddaa5f3e42136dc (diff) | |
| parent | e15a6a37d297bb466b96c3baf6073cc971c56ba2 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I23522a8f71cea8d8e3f0155dad98e41c003774fb
Diffstat (limited to 'src/imports/controls/doc/src/qtquickcontrols2-highdpi.qdoc')
| -rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-highdpi.qdoc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-highdpi.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-highdpi.qdoc index 474894f5..f0440e4f 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-highdpi.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-highdpi.qdoc @@ -27,9 +27,10 @@ /*! \page qtquickcontrols2-highdpi.html - \title High-DPI Support in Qt Quick Controls 2 + \keyword High-DPI Support in Qt Quick Controlsi 2 + \title High-DPI Support in Qt Quick Controls - Qt Quick Controls 2 support Qt's cross-platform high-DPI scaling introduced in Qt 5.6. + Qt Quick Controls support Qt's cross-platform high-DPI scaling introduced in Qt 5.6. The feature is opt-in, and can be enabled by setting the \c Qt::AA_EnableHighDpiScaling application attribute in C++ before QGuiApplication is constructed: @@ -52,7 +53,7 @@ \warning \l {Qt Quick Controls}{Qt Quick Controls 1.x} are not compatible with Qt's automatic high-DPI scaling. There is currently no available solution for high-DPI - support in applications wishing to mix Qt Quick Controls and Qt Quick Controls 2. + support in applications wishing to mix Qt Quick Controls and Qt Quick Controls. \section1 Related Information \list |