diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | doc/global/macros.qdocconf | 1 | ||||
| -rw-r--r-- | doc/src/portingguide-5-to-6.qdoc | 54 |
3 files changed, 63 insertions, 0 deletions
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt new file mode 100644 index 0000000000..81f1017dde --- /dev/null +++ b/doc/CMakeLists.txt @@ -0,0 +1,8 @@ +# special case skip regeneration +# +# Copy/Install doc configuration files to the build/install directory +# +qt_path_join(doc_install_dir ${QT_INSTALL_DIR} ${INSTALL_DOCDIR}) +qt_copy_or_install(DIRECTORY global DESTINATION ${doc_install_dir}) +qt_copy_or_install(DIRECTORY config DESTINATION ${doc_install_dir}) + diff --git a/doc/global/macros.qdocconf b/doc/global/macros.qdocconf index f553cd8e14..3a525224c1 100644 --- a/doc/global/macros.qdocconf +++ b/doc/global/macros.qdocconf @@ -18,6 +18,7 @@ macro.nullptr = "\\c{nullptr}" macro.QA = "\\e{Qt Assistant}" macro.QD = "\\e{Qt Designer}" macro.QL = "\\e{Qt Linguist}" +macro.Q_OBJECT = "Q_OBJECT" macro.QQV = "\\e{Qt QML Viewer}" macro.QtVersion = "$QT_VERSION" macro.QtVer = "$QT_VER" diff --git a/doc/src/portingguide-5-to-6.qdoc b/doc/src/portingguide-5-to-6.qdoc new file mode 100644 index 0000000000..8a6ea34b56 --- /dev/null +++ b/doc/src/portingguide-5-to-6.qdoc @@ -0,0 +1,54 @@ +/**************************************************************************** +** +** Copyright (C) 2019 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 portingguide.html +\title Porting Qt5 to Qt6 Guide +\brief Provides guidance to migrate your Qt 5 application to Qt 6. + +Qt 6 is a result of the conscious effort to make this C++ framework more +efficient and easy to use. This release replaces quite a few legacy APIs with +more meaningful ones, such as the newer version of Qt Quick. + +We try to maintain binary and source compatibility for all the public APIs in +each release, but some changes were inevitable in an effort to make Qt a +better framework. In this topic, we try to summarize those changes and +provide guidance to handle them. + +The following list summarizes the changes in Qt 6: +\list + \li The major version number. +\endlist + +\section1 Related Topics +\list +\li \l {C++ API Changes} +\li \l {Porting C++ Applications to Qt 6} +\li \l {Porting QML Applications to Qt 6} +\li \l {Porting QML Applications to Qt 6 Example} +\endlist +*/ |