summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/multimedia/doc/src/platform-notes-ios.qdoc43
-rw-r--r--src/multimedia/doc/src/qtmultimedia-index.qdoc1
2 files changed, 44 insertions, 0 deletions
diff --git a/src/multimedia/doc/src/platform-notes-ios.qdoc b/src/multimedia/doc/src/platform-notes-ios.qdoc
new file mode 100644
index 000000000..81e9ea0c5
--- /dev/null
+++ b/src/multimedia/doc/src/platform-notes-ios.qdoc
@@ -0,0 +1,43 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://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: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\page qtmultimedia-ios.html
+\title Qt Multimedia on iOS
+\brief Platform notes for iOS
+
+This page covers the availability of Qt Multimedia features on iOS.
+
+\section1 Limitations
+
+Since Qt Multimedia for iOS uses the camera, the \c Info.plist assigned to
+QMAKE_INFO_PLIST in the project file must contain the key
+\c NSCameraUsageDescription. Otherwise the application will
+abort on startup. See Info.plist documentation from Apple for more information
+regarding this key.
+
+*/
diff --git a/src/multimedia/doc/src/qtmultimedia-index.qdoc b/src/multimedia/doc/src/qtmultimedia-index.qdoc
index 553732fd1..dfc9c3f15 100644
--- a/src/multimedia/doc/src/qtmultimedia-index.qdoc
+++ b/src/multimedia/doc/src/qtmultimedia-index.qdoc
@@ -158,6 +158,7 @@
\list
\li \l{Qt Multimedia on Windows}{Windows}
+ \li \l{Qt Multimedia on iOS}{iOS}
\endlist
\section2 Reference