From 09cad0df0d2e13d966766c2f276e01e708be1950 Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Thu, 24 Sep 2020 12:40:54 +0200 Subject: Doc: Add Qt 6 changes files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-84051 Change-Id: Ibfd1750b571f65bf76a3922f89510b6c6fd4eff9 Reviewed-by: Topi Reiniö --- src/imports/controls/doc/src/qt6-changes.qdoc | 42 ++++++++++++++++++++++ .../controls/doc/src/qtquickcontrols2-index.qdoc | 4 +++ src/imports/platform/doc/src/qt6-changes.qdoc | 42 ++++++++++++++++++++++ .../platform/doc/src/qtlabsplatform-index.qdoc | 4 +++ src/imports/templates/doc/src/qt6-changes.qdoc | 42 ++++++++++++++++++++++ .../templates/doc/src/qtquicktemplates2-index.qdoc | 4 +++ 6 files changed, 138 insertions(+) create mode 100644 src/imports/controls/doc/src/qt6-changes.qdoc create mode 100644 src/imports/platform/doc/src/qt6-changes.qdoc create mode 100644 src/imports/templates/doc/src/qt6-changes.qdoc (limited to 'src') diff --git a/src/imports/controls/doc/src/qt6-changes.qdoc b/src/imports/controls/doc/src/qt6-changes.qdoc new file mode 100644 index 00000000..b29018d6 --- /dev/null +++ b/src/imports/controls/doc/src/qt6-changes.qdoc @@ -0,0 +1,42 @@ +/**************************************************************************** +** +** Copyright (C) 2020 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 qtquickcontrols-changes-qt6.html + \title Porting to Qt 6 - Qt Quick Controls + + Qt 6 is a result of the conscious effort to make the framework more + efficient and easy to use. + + We try to maintain compatibility for all the public APIs in each release. + Some changes were inevitable in an effort to make Qt a better framework. + + In this topic we summarize those changes in Qt Quick Controls, and provide + guidance to handle them. + + \section1 ADD STUFF HERE +*/ diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc index 7bc13e31..32ce14df 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc @@ -137,6 +137,10 @@ \li ... \endtable + \section1 Module Evolution + \l{Porting to Qt 6 - Qt Quick Controls} lists important changes in the + module API and functionality that were done for the Qt 6 series of Qt. + \section1 License and Attributions Qt Quick Controls is available under commercial licenses from \l{The Qt Company}. diff --git a/src/imports/platform/doc/src/qt6-changes.qdoc b/src/imports/platform/doc/src/qt6-changes.qdoc new file mode 100644 index 00000000..a919a087 --- /dev/null +++ b/src/imports/platform/doc/src/qt6-changes.qdoc @@ -0,0 +1,42 @@ +/**************************************************************************** +** +** Copyright (C) 2020 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 qtquicklabsplatform-changes-qt6.html + \title Porting to Qt 6 - Qt Quick Labs Platform + + Qt 6 is a result of the conscious effort to make the framework more + efficient and easy to use. + + We try to maintain compatibility for all the public APIs in each release. + Some changes were inevitable in an effort to make Qt a better framework. + + In this topic we summarize those changes in Qt Quick Labs Platform, and + provide guidance to handle them. + + \section1 ADD STUFF HERE +*/ diff --git a/src/imports/platform/doc/src/qtlabsplatform-index.qdoc b/src/imports/platform/doc/src/qtlabsplatform-index.qdoc index 7b3f78fb..7c7cf7d3 100644 --- a/src/imports/platform/doc/src/qtlabsplatform-index.qdoc +++ b/src/imports/platform/doc/src/qtlabsplatform-index.qdoc @@ -41,6 +41,10 @@ \labs + \section1 Module Evolution + \l{Porting to Qt 6 - Qt Quick Labs Platform} lists important changes in the + module API and functionality that were done for the Qt 6 series of Qt. + \section1 Related Information \list diff --git a/src/imports/templates/doc/src/qt6-changes.qdoc b/src/imports/templates/doc/src/qt6-changes.qdoc new file mode 100644 index 00000000..3ba41019 --- /dev/null +++ b/src/imports/templates/doc/src/qt6-changes.qdoc @@ -0,0 +1,42 @@ +/**************************************************************************** +** +** Copyright (C) 2020 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 qtquicktemplates-changes-qt6.html + \title Porting to Qt 6 - Qt Quick Templates + + Qt 6 is a result of the conscious effort to make the framework more + efficient and easy to use. + + We try to maintain compatibility for all the public APIs in each release. + Some changes were inevitable in an effort to make Qt a better framework. + + In this topic we summarize those changes in Qt Quick Templates, and provide + guidance to handle them. + + \section1 ADD STUFF HERE +*/ diff --git a/src/imports/templates/doc/src/qtquicktemplates2-index.qdoc b/src/imports/templates/doc/src/qtquicktemplates2-index.qdoc index 492785a4..9a2da009 100644 --- a/src/imports/templates/doc/src/qtquicktemplates2-index.qdoc +++ b/src/imports/templates/doc/src/qtquicktemplates2-index.qdoc @@ -44,6 +44,10 @@ and disabled states. Any input event handling and state processing is taken care of by the underlying template. + \section1 Module Evolution + \l{Porting to Qt 6 - Qt Quick Templates} lists important changes in the + module API and functionality that were done for the Qt 6 series of Qt. + \section1 Related Information \list -- cgit v1.2.3