aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@petroules.com>2015-01-06 18:35:35 -0800
committerJoerg Bornemann <joerg.bornemann@theqtcompany.com>2015-02-09 16:09:28 +0000
commitd2f431f74a4f7983dbd684c519ca75e6d88ed886 (patch)
treefc388fc2311fb7c9793dca667e11ce5b22f0d6eb /doc
parent4b9248c8e3724f9758931d40a7163ee5cb7e3cc5 (diff)
Add support for building OS X and iOS App Extensions.
Change-Id: I92ca00b8741098a292578d12a027fa24a6ed577f Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/reference/items/application.qdoc2
-rw-r--r--doc/reference/items/applicationextension.qdoc42
-rw-r--r--doc/reference/items/artifact.qdoc2
3 files changed, 44 insertions, 2 deletions
diff --git a/doc/reference/items/application.qdoc b/doc/reference/items/application.qdoc
index a51146c0f..959352d3e 100644
--- a/doc/reference/items/application.qdoc
+++ b/doc/reference/items/application.qdoc
@@ -31,7 +31,7 @@
\contentspage list-of-items.html
\page application-item.html
\previouspage androidapk-item.html
- \nextpage artifact-item.html
+ \nextpage applicationextension-item.html
\ingroup list-of-items
\title Application Item
diff --git a/doc/reference/items/applicationextension.qdoc b/doc/reference/items/applicationextension.qdoc
new file mode 100644
index 000000000..c8dde96c7
--- /dev/null
+++ b/doc/reference/items/applicationextension.qdoc
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 Jake Petroules.
+** 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://www.qt.io/licensing. For further information
+** use the contact form at http://www.qt.io/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 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** 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 applicationextension-item.html
+ \previouspage application-item.html
+ \nextpage artifact-item.html
+ \ingroup list-of-items
+
+ \title ApplicationExtension Item
+ \brief Represents a product that is an OS X or iOS Application Extension.
+
+ An \c ApplicationExtension item is a convenience item based on \c XPCService that
+ sets some properties required for OS X and iOS Application Extensions.
+*/
diff --git a/doc/reference/items/artifact.qdoc b/doc/reference/items/artifact.qdoc
index 41a97443a..53e25e05d 100644
--- a/doc/reference/items/artifact.qdoc
+++ b/doc/reference/items/artifact.qdoc
@@ -30,7 +30,7 @@
/*!
\contentspage list-of-items.html
\page artifact-item.html
- \previouspage application-item.html
+ \previouspage applicationextension-item.html
\nextpage autotestrunner-item.html
\ingroup list-of-items