diff options
Diffstat (limited to 'doc/src/qtcreator.qdoc')
-rw-r--r-- | doc/src/qtcreator.qdoc | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/doc/src/qtcreator.qdoc b/doc/src/qtcreator.qdoc index 27316fc87cc..c23476a3766 100644 --- a/doc/src/qtcreator.qdoc +++ b/doc/src/qtcreator.qdoc @@ -1,20 +1,27 @@ -/************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of Qt Creator +** 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 -** +** 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. -** +** 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. ** -**************************************************************************/ +****************************************************************************/ // ********************************************************************** // NOTE: the sections are not ordered by their logical order to avoid |