diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-15 13:51:20 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-15 13:55:22 +0200 |
| commit | 6f617349cf865ca3a7befc0dd472b7c2510fc431 (patch) | |
| tree | 37e70da54a7f3101b82551ccd98508f8d9d64330 /src/imports/controls/doc/src/qtquickcontrols2-highdpi.qdoc | |
| parent | 718e08392f34dc478ea010c08a4b9c77bb665dfc (diff) | |
| parent | 8e2d1b1efe736760d27af17160f662454546b054 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Removed dependencies.yaml.
Change-Id: I1e2b3f486e9ace4bc8dc0419a64848990b3a6b39
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 |