diff options
author | Christian Kandeler <christian.kandeler@digia.com> | 2014-07-09 16:04:14 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-07-14 12:22:10 +0200 |
commit | 3a037fe9a274953549c52d6d41e6112daa6362ac (patch) | |
tree | 2f5d801a7f3725df18ed14bfd878c201e0b304f0 /doc/reference | |
parent | 7eebf9997850de606bbd00f5eb64720888940c1c (diff) |
Add and make use of convenience item QtGuiApplication.
Using this item, building a Qt gui app against a static Qt
will work out of the box.
Also add the less useful QtApplication for completeness.
Change-Id: Idca1dbd3085659ebaf563f7df89f73b9daaf7001
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'doc/reference')
-rw-r--r-- | doc/reference/items/propertyoptions.qdoc | 2 | ||||
-rw-r--r-- | doc/reference/items/qtapplication.qdoc | 46 | ||||
-rw-r--r-- | doc/reference/items/qtguiapplication.qdoc | 58 | ||||
-rw-r--r-- | doc/reference/items/rule.qdoc | 2 |
4 files changed, 106 insertions, 2 deletions
diff --git a/doc/reference/items/propertyoptions.qdoc b/doc/reference/items/propertyoptions.qdoc index b2be5238e..983f1cd18 100644 --- a/doc/reference/items/propertyoptions.qdoc +++ b/doc/reference/items/propertyoptions.qdoc @@ -31,7 +31,7 @@ \contentspage list-of-items.html \previouspage properties-item.html \page propertyoptions-item.html - \nextpage rule-item.html + \nextpage qtapplication-item.html \ingroup list-of-items \title PropertyOptions Item diff --git a/doc/reference/items/qtapplication.qdoc b/doc/reference/items/qtapplication.qdoc new file mode 100644 index 000000000..0e194f2cf --- /dev/null +++ b/doc/reference/items/qtapplication.qdoc @@ -0,0 +1,46 @@ +/**************************************************************************** +** +** Copyright (C) 2014 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 qtapplication-item.html + \previouspage propertyoptions-item.html + \nextpage qtguiapplication-item.html + \ingroup list-of-items + + \title QtApplication Item + \brief Represents a product of application type with a dependency to the Qt Core module. + + A \c QtApplication is a convenience item that is entirely equivalent to the following: + \code + CppApplication { + Depends { name: "Qt.core" } } + } + \endcode + +*/ diff --git a/doc/reference/items/qtguiapplication.qdoc b/doc/reference/items/qtguiapplication.qdoc new file mode 100644 index 000000000..5af911e41 --- /dev/null +++ b/doc/reference/items/qtguiapplication.qdoc @@ -0,0 +1,58 @@ +/**************************************************************************** +** +** Copyright (C) 2014 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 qtguiapplication-item.html + \previouspage propertyoptions-item.html + \nextpage rule-item.html + \ingroup list-of-items + + \title QtGuiApplication Item + \brief Represents a product of application type with a dependency to the Qt GUI module. + + A \c QtGuiApplication is a convenience item that extends the \c QtApplication item by loading + the \c Qt.gui module and possibly also the default QPA plugin. + + \section1 QtGuiApplication Properties + + \table + \header + \li Property + \li Type + \li Default + \li Description + \row + \li linkDefaultQpaPlugin + \li bool + \li Qt.core.staticBuild == true + \li Whether or not to add a depencency to the default QPA plugin. The default is to + do that in the case of a static build, where it is normally required. + \endtable + +*/ diff --git a/doc/reference/items/rule.qdoc b/doc/reference/items/rule.qdoc index 9a174e49c..85d18701e 100644 --- a/doc/reference/items/rule.qdoc +++ b/doc/reference/items/rule.qdoc @@ -28,7 +28,7 @@ ****************************************************************************/ /*! \contentspage list-of-items.html - \previouspage propertyoptions-item.html + \previouspage qtapplication-item.html \page rule-item.html \nextpage staticlibrary-item.html \ingroup list-of-items |