diff options
author | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2017-02-10 15:17:34 +0100 |
---|---|---|
committer | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2017-02-13 08:14:53 +0000 |
commit | 3858d4c3634962e1e4b93ba00d0cb325f1e70947 (patch) | |
tree | 1821b5794811a2cd3081b9a29e02e109c41dc3e5 /doc/src/qtquick | |
parent | 0c9f23db96f53420d42d01ae8f8d6b549dce7587 (diff) |
Doc: Add licenses to .qdocinc files
Change-Id: Ia20fe2605a6255af24d4334d8289531aaa262511
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'doc/src/qtquick')
5 files changed, 65 insertions, 3 deletions
diff --git a/doc/src/qtquick/creator-mobile-app-tutorial.qdoc b/doc/src/qtquick/creator-mobile-app-tutorial.qdoc index 6f93fe81c2..00d8d3e187 100644 --- a/doc/src/qtquick/creator-mobile-app-tutorial.qdoc +++ b/doc/src/qtquick/creator-mobile-app-tutorial.qdoc @@ -64,7 +64,7 @@ Program certificate that you receive from Apple. For more information, see \l{Connecting iOS Devices}. - \include creator-tutorial-create-qq-project.qdocinc + \include creator-tutorial-create-qq-project.qdocinc qt quick application \section1 Creating the Accelbubble Main View diff --git a/doc/src/qtquick/creator-projects-settings-run-qtquick.qdocinc b/doc/src/qtquick/creator-projects-settings-run-qtquick.qdocinc index 2647559209..4d1561b47c 100644 --- a/doc/src/qtquick/creator-projects-settings-run-qtquick.qdocinc +++ b/doc/src/qtquick/creator-projects-settings-run-qtquick.qdocinc @@ -1,3 +1,31 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Creator documentation. +** +** 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. +** +****************************************************************************/ + +/*! +//! [run settings qt quick ui] + \section1 Specifying Run Settings for Qt Quick UI Projects You can specify run settings for \l{glossary-buildandrun-kit}{kits} @@ -14,3 +42,6 @@ \endlist \image qmldesigner-run-settings.png "Run settings for Qt Quick UI projects" + +//! [run settings qt quick ui] +*/ diff --git a/doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc b/doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc index dba2fde2ad..87a7dd3415 100644 --- a/doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc +++ b/doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc @@ -1,3 +1,31 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Creator documentation. +** +** 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 quick application] + \section1 Creating the Project \list 1 @@ -42,3 +70,6 @@ \QC generates a UI file, \e MainForm.ui.qml, that you can modify in the \uicontrol Design mode and a QML file, \e main.qml, that you can modify in the \uicontrol Edit mode to add the application logic. + +//! [qt quick application] +*/ diff --git a/doc/src/qtquick/qtquick-app-tutorial.qdoc b/doc/src/qtquick/qtquick-app-tutorial.qdoc index d478b30d5a..af83e1d8fd 100644 --- a/doc/src/qtquick/qtquick-app-tutorial.qdoc +++ b/doc/src/qtquick/qtquick-app-tutorial.qdoc @@ -52,7 +52,7 @@ For tutorials that describe using Qt Quick Controls, see \l{Qt Quick Text Editor Guide} and \l{Qt Quick Controls - UI Forms}. - \include creator-tutorial-create-qq-project.qdocinc + \include creator-tutorial-create-qq-project.qdocinc qt quick application \section1 Creating the Main View diff --git a/doc/src/qtquick/qtquick-uiforms-tutorial.qdoc b/doc/src/qtquick/qtquick-uiforms-tutorial.qdoc index 02dcfe3e52..9228dfc808 100644 --- a/doc/src/qtquick/qtquick-uiforms-tutorial.qdoc +++ b/doc/src/qtquick/qtquick-uiforms-tutorial.qdoc @@ -48,7 +48,7 @@ minimum by creating custom QML types that you edit in the \uicontrol Edit mode. - \include creator-tutorial-create-qq-project.qdocinc + \include creator-tutorial-create-qq-project.qdocinc qt quick application \section1 Creating the UI Forms Main View |