diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-12-12 15:31:32 +0100 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-12-12 15:31:58 +0100 |
commit | 2c3ba00f3eb8e2ffb2c6d4ee67873d87c781c3af (patch) | |
tree | a7edd3f57094ea52c826f6fc739e1a19380569a0 /doc | |
parent | 461215e5e80ad26a1ab583aecc9797ffea16cdb0 (diff) | |
parent | 32b7a5042535262501af40acb0fe7219608d70a9 (diff) |
Merge remote-tracking branch 'origin/1.1'
Change-Id: Ic3e0027187a15fdc59faeee6fa51ebeb73828c28
Diffstat (limited to 'doc')
-rw-r--r-- | doc/reference/items/application.qdoc | 57 | ||||
-rw-r--r-- | doc/reference/items/artifact.qdoc | 3 | ||||
-rw-r--r-- | doc/reference/items/cppapplication.qdoc | 44 | ||||
-rw-r--r-- | doc/reference/items/depends.qdoc | 4 | ||||
-rw-r--r-- | doc/reference/items/dynamiclibrary.qdoc | 57 | ||||
-rw-r--r-- | doc/reference/items/export.qdoc | 2 | ||||
-rw-r--r-- | doc/reference/items/rule.qdoc | 2 | ||||
-rw-r--r-- | doc/reference/items/staticlibrary.qdoc | 46 | ||||
-rw-r--r-- | doc/reference/items/subproject.qdoc | 2 |
9 files changed, 211 insertions, 6 deletions
diff --git a/doc/reference/items/application.qdoc b/doc/reference/items/application.qdoc new file mode 100644 index 000000000..ebbfec4a0 --- /dev/null +++ b/doc/reference/items/application.qdoc @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt Build Suite. +** +** 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +****************************************************************************/ +/*! + \contentspage list-of-items.html + \page application-item.html + \nextpage artifact-item.html + \ingroup list-of-items + + \title Application Item + \brief Represents a product of application type. + + An \c Application item is a \c Product that has its type set to "application" + (or "applicationbundle" on Darwin platforms such as OS X and iOS). It exists for the convenience + of project file authors. + + \section1 Application Properties + The following properties are available in addition to the ones inherited from \c Product. + + \table + \header + \li Property + \li Type + \li Default + \li Description + \row + \li bundleExtension + \li string + \li empty + \li The extension to use for the product's bundle. Only relevant on Darwin systems. + \endtable +*/ diff --git a/doc/reference/items/artifact.qdoc b/doc/reference/items/artifact.qdoc index f136e2201..ca3a79a8b 100644 --- a/doc/reference/items/artifact.qdoc +++ b/doc/reference/items/artifact.qdoc @@ -30,7 +30,8 @@ /*! \contentspage list-of-items.html \page artifact-item.html - \nextpage depends-item.html + \previouspage application-item.html + \nextpage cppapplication-item.html \ingroup list-of-items \title Artifact Item diff --git a/doc/reference/items/cppapplication.qdoc b/doc/reference/items/cppapplication.qdoc new file mode 100644 index 000000000..0534b887d --- /dev/null +++ b/doc/reference/items/cppapplication.qdoc @@ -0,0 +1,44 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt Build Suite. +** +** 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +****************************************************************************/ +/*! + \contentspage list-of-items.html + \page cppapplication-item.html + \previouspage artifact-item.html + \nextpage depends-item.html + \ingroup list-of-items + + \title CppApplication Item + \brief Represents a product of application type with a dependency to the cpp module. + + A \c CppApplication is a convenience item that is entirely equivalent to the following: + \code + Application { + Depends { name: "cpp" } } + \endcode +*/ diff --git a/doc/reference/items/depends.qdoc b/doc/reference/items/depends.qdoc index 2e60eed47..1bb7c0142 100644 --- a/doc/reference/items/depends.qdoc +++ b/doc/reference/items/depends.qdoc @@ -29,9 +29,9 @@ ****************************************************************************/ /*! \contentspage list-of-items.html - \previouspage artifact-item.html + \previouspage cppapplication-item.html \page depends-item.html - \nextpage export-item.html + \nextpage dynamiclibrary-item.html \ingroup list-of-items \title Depends Item diff --git a/doc/reference/items/dynamiclibrary.qdoc b/doc/reference/items/dynamiclibrary.qdoc new file mode 100644 index 000000000..8001af019 --- /dev/null +++ b/doc/reference/items/dynamiclibrary.qdoc @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt Build Suite. +** +** 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +****************************************************************************/ +/*! + \contentspage list-of-items.html + \page dynamiclibrary-item.html + \previouspage depends-item.html + \nextpage export-item.html + \ingroup list-of-items + + \title DynamicLibrary Item + \brief Represents a product that is a dynamic library. + + A \c DynamicLibrary item is a \c Product that has its type set to "dynamiclibrary". It exists + for the convenience of project file authors. + + \section1 DynamicLibrary Properties + The following properties are available in addition to the ones inherited from \c Product. + + \table + \header + \li Property + \li Type + \li Default + \li Description + \row + \li bundleExtension + \li string + \li empty + \li The extension to use for the product's bundle. Only relevant on Darwin systems. + \endtable +*/ diff --git a/doc/reference/items/export.qdoc b/doc/reference/items/export.qdoc index d37514dfa..633bdaca7 100644 --- a/doc/reference/items/export.qdoc +++ b/doc/reference/items/export.qdoc @@ -28,7 +28,7 @@ ****************************************************************************/ /*! \contentspage list-of-items.html - \previouspage depends-item.html + \previouspage dynamiclibrary-item.html \page export-item.html \nextpage filetagger-item.html \ingroup list-of-items diff --git a/doc/reference/items/rule.qdoc b/doc/reference/items/rule.qdoc index 6a864d57d..0c4f3bc20 100644 --- a/doc/reference/items/rule.qdoc +++ b/doc/reference/items/rule.qdoc @@ -30,7 +30,7 @@ \contentspage list-of-items.html \previouspage propertyoptions-item.html \page rule-item.html - \nextpage subproject-item.html + \nextpage staticlibrary-item.html \ingroup list-of-items \title Rule Item diff --git a/doc/reference/items/staticlibrary.qdoc b/doc/reference/items/staticlibrary.qdoc new file mode 100644 index 000000000..b9ac04265 --- /dev/null +++ b/doc/reference/items/staticlibrary.qdoc @@ -0,0 +1,46 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt Build Suite. +** +** 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +****************************************************************************/ +/*! + \contentspage list-of-items.html + \page staticlibrary-item.html + \previouspage rule-item.html + \nextpage subproject-item.html + \ingroup list-of-items + + \title StaticLibrary Item + \brief Represents a product that is a static library. + + A \c StaticLibrary item is a convenience item that is entirely equivalent to + the following: + \code + Product { + type: "staticlibrary" + } + \endcode +*/ diff --git a/doc/reference/items/subproject.qdoc b/doc/reference/items/subproject.qdoc index c89807ded..2be7b0ac0 100644 --- a/doc/reference/items/subproject.qdoc +++ b/doc/reference/items/subproject.qdoc @@ -28,7 +28,7 @@ ****************************************************************************/ /*! \contentspage list-of-items.html - \previouspage rule-item.html + \previouspage staticlibrary-item.html \page subproject-item.html \nextpage transformer-item.html \ingroup list-of-items |