diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-16 09:58:22 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-16 12:27:46 +0200 |
commit | ae6132cb20584357fb342ef51f15523e53b7532a (patch) | |
tree | 66e28e5fd904fceac930fd1623a307f5b9021f4e | |
parent | 153c0ee3c415f4f8bfb854b68565d10f7fc6e404 (diff) |
Remove "High-DPI Support in Qt Quick Controls" doc page
It is probably wrong enough to require a thorough rewrite. Given that it has
nuggest such as "There is currently no available solution for high-DPI support
in applications wishing to mix Qt Quick Controls and Qt Quick Controls",
starting from scratch seems best.
Change-Id: Id1ae9d0bc58da452457cbf4bcdebf658f74cb377
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
3 files changed, 0 insertions, 69 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-highdpi.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-highdpi.qdoc deleted file mode 100644 index f0440e4f..00000000 --- a/src/imports/controls/doc/src/qtquickcontrols2-highdpi.qdoc +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \page qtquickcontrols2-highdpi.html - \keyword High-DPI Support in Qt Quick Controlsi 2 - \title High-DPI Support in Qt Quick Controls - - 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: - - \code - #include <QGuiApplication> - #include <QQmlApplicationEngine> - - int main(int argc, char *argv[]) - { - QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // <-- - QGuiApplication app(argc, argv); - QQmlApplicationEngine engine; - engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); - return app.exec(); - } - \endcode - - Alternatively, an environment variable \c QT_AUTO_SCREEN_SCALE_FACTOR=1 can be set - to enable automatic high-DPI scaling. - - \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. - - \section1 Related Information - \list - \li \l {High DPI Displays} - \li \l {Scalability} - \endlist -*/ diff --git a/src/imports/controls/doc/src/qtquickcontrols2-icons.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-icons.qdoc index 190aafd9..ea8579dc 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-icons.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-icons.qdoc @@ -163,9 +163,4 @@ The \l {Qt Quick Controls - Gallery}{Gallery example} and \l {Qt Quick Controls 2 - Wearable Demo} {Wearable Demo} provide complete runnable applications with a bundled icon theme. - - \section1 Related Information - \list - \li \l {High-DPI Support in Qt Quick Controls} - \endlist */ diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc index c0047c30..7bc13e31 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc @@ -158,7 +158,6 @@ \li \l{Styling Qt Quick Controls}{Styling} \li \l{Icons in Qt Quick Controls}{Icons} \li \l{Customizing Qt Quick Controls}{Customization} - \li \l{High-DPI Support in Qt Quick Controls}{High-DPI Support} \li \l{Using File Selectors with Qt Quick Controls}{Using File Selectors} \li \l{Deploying Qt Quick Controls Applications}{Deployment} \li \l{Qt Quick Controls Configuration File}{Configuration File} |