Doc: add docs for ISO Icon Browser

A commercial Qt Quick Designer plugin for
adding ISO 7000 icons to applications from
an icon library.

Change-Id: I96d740d63bc77da9817ce2d5ccdb1625dbc5caa6
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>

7 files changed, 91 insertions, 2 deletions

diff --git a/doc/config/qtcreator-project.qdocconf b/doc/config/qtcreator-project.qdocconf
index e13fb032e3..a7c5b8bdec 100644
--- a/doc/config/qtcreator-project.qdocconf
+++ b/doc/config/qtcreator-project.qdocconf
@@ -23,6 +23,7 @@ indexes +=    $QDOC_INDEX_DIR/qtwidgets/qtwidgets.index \
               $QDOC_INDEX_DIR/qtgui/qtgui.index \
               $QDOC_INDEX_DIR/qthelp/qthelp.index \
               $QDOC_INDEX_DIR/qtquickcontrols/qtquickcontrols.index \
+              $QDOC_INDEX_DIR/qtquickextras/qtquickextras.index \
               $QDOC_INDEX_DIR/qtquicklayouts/qtquicklayouts.index \
               $QDOC_INDEX_DIR/qtlinguist/qtlinguist.index \
               $QDOC_INDEX_DIR/qtscript/qtscript.index \
diff --git a/doc/images/qtcreator-iso-icon-browser.png b/doc/images/qtcreator-iso-icon-browser.png
new file mode 100644
index 0000000000..b59b319b1b
--- /dev/null
+++ b/doc/images/qtcreator-iso-icon-browser.png
diff --git a/doc/src/qtcreator.qdoc b/doc/src/qtcreator.qdoc
index bb13c514ef..4a782ca311 100644
--- a/doc/src/qtcreator.qdoc
+++ b/doc/src/qtcreator.qdoc
@@ -185,6 +185,7 @@
                 \li \l {Creating Buttons}
                 \li \l {Creating Scalable Buttons and Borders}
                 \li \l {Creating Screens}
+                \li \l {Browsing ISO 7000 Icons}
                 \li \l {Exporting Designs from Graphics Software}
                 \li \l {Using QML Modules with Plugins}
             \endlist
diff --git a/doc/src/qtquick/qtquick-app-development.qdoc b/doc/src/qtquick/qtquick-app-development.qdoc
index c0becbe2df..12d5019a68 100644
--- a/doc/src/qtquick/qtquick-app-development.qdoc
+++ b/doc/src/qtquick/qtquick-app-development.qdoc
@@ -69,6 +69,11 @@
             Dialogs, and Layouts (available since Qt 5.1) to create screens. You
             can use states and transitions to navigate between screens.
 
+        \li \l {Browsing ISO 7000 Icons}
+
+            You can add ISO 7000 icons from a library delivered with \QC to Qt
+            Quick applications and change their color (commercial only).
+
         \li \l {Exporting Designs from Graphics Software}
 
             You can export designs from graphics software, such as Adobe
diff --git a/doc/src/qtquick/qtquick-exporting-qml.qdoc b/doc/src/qtquick/qtquick-exporting-qml.qdoc
index 8a7957713b..470033e7e3 100644
--- a/doc/src/qtquick/qtquick-exporting-qml.qdoc
+++ b/doc/src/qtquick/qtquick-exporting-qml.qdoc
@@ -25,7 +25,7 @@
 /*!
 
     \contentspage {Qt Creator Manual}
-    \previouspage qmldesigner-connections.html
+    \previouspage qtquick-iso-icon-browser.html
     \page quick-export-to-qml.html
     \nextpage creator-qml-modules-with-plugins.html
 
diff --git a/doc/src/qtquick/qtquick-iso-icon-browser.qdoc b/doc/src/qtquick/qtquick-iso-icon-browser.qdoc
new file mode 100644
index 0000000000..73eed1b553
--- /dev/null
+++ b/doc/src/qtquick/qtquick-iso-icon-browser.qdoc
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing
+**
+** This file is part of Qt Creator.
+**
+** 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 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, The Qt Company gives you certain additional
+** rights.  These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+/*!
+    \contentspage {Qt Creator Manual}
+    \previouspage quick-screens.html
+    \page qtquick-iso-icon-browser.html
+    \nextpage quick-export-to-qml.html
+
+    \title Browsing ISO 7000 Icons
+
+    \commercial
+
+    You can add icons from an ISO 7000 icon library that is installed with \QC
+    to Qt Quick applications (commercial only). You can use the
+    \uicontrol {ISO Icon Browser} to add a \l {Picture} type and select the
+    icon to use for the type. You can change the default color of the icon.
+
+    \image qtcreator-iso-icon-browser.png
+
+    \section1 Using ISO Icons in Applications
+
+    \list 1
+
+        \li Create a new Qt Quick Application or open an application in \QC.
+
+        \li Open the Qt Quick UI form in the \uicontrol Design mode.
+
+        \li In the \uicontrol Library, select \uicontrol Imports >
+            \uicontrol {Add Import} > \uicontrol {QtQuick.Extras} to import the
+            \l {Qt Quick Extras} module.
+
+        \li Drag and drop a \uicontrol Picture element from the library to the
+            canvas.
+
+        \li Right-click the picture element and select \uicontrol {Choose Icon}
+            to open the \uicontrol {ISO Icon Browser}.
+
+        \li To find icons, select a criterion for filtering icons and enter a
+            search string.
+
+        \li Select an icon in the list, and then select \uicontrol OK to add
+            the icon.
+
+        \li To view the icon you added, press \key {Ctrl+R} (or \key {Cmd+R})
+            to run the application.
+
+        \li To adjust the icon color, select the icon on the canvas, and then
+            select \uicontrol {Edit Color} in the context menu.
+
+    \endlist
+
+    \QC generates a Qt resource file called \c iso-icons.qrc that adds the
+    icons as a part of your project for delivery with your application.
+
+    */
diff --git a/doc/src/qtquick/qtquick-screens.qdoc b/doc/src/qtquick/qtquick-screens.qdoc
index 264d93e53b..fa1cd9055a 100644
--- a/doc/src/qtquick/qtquick-screens.qdoc
+++ b/doc/src/qtquick/qtquick-screens.qdoc
@@ -27,7 +27,7 @@
     \contentspage {Qt Creator Manual}
     \previouspage quick-scalable-image.html
     \page quick-screens.html
-    \nextpage creator-qtquick-designer-extensions.html
+    \nextpage qtquick-iso-icon-browser.html
 
     \title Creating Screens