From 178c0ef8a865bc48192c125835df4305f9d70bf5 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@theqtcompany.com>
Date: Tue, 22 Dec 2015 21:33:02 +0100
Subject: Doc: Gallery
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: If8ec0bfef5db602472c54745102d6d20b61e5e47
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
---
 .../doc/images/qtlabscontrols-gallery-drawer.png   | Bin 0 -> 17156 bytes
 .../doc/images/qtlabscontrols-gallery-menu.png     | Bin 0 -> 17209 bytes
 .../doc/images/qtlabscontrols-gallery-welcome.png  | Bin 0 -> 23502 bytes
 src/imports/controls/doc/qtlabscontrols.qdocconf   |   4 +-
 .../controls/doc/src/qtlabscontrols-examples.qdoc  |  68 +++++++++++++++++++++
 5 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 src/imports/controls/doc/images/qtlabscontrols-gallery-drawer.png
 create mode 100644 src/imports/controls/doc/images/qtlabscontrols-gallery-menu.png
 create mode 100644 src/imports/controls/doc/images/qtlabscontrols-gallery-welcome.png
 create mode 100644 src/imports/controls/doc/src/qtlabscontrols-examples.qdoc

(limited to 'src')

diff --git a/src/imports/controls/doc/images/qtlabscontrols-gallery-drawer.png b/src/imports/controls/doc/images/qtlabscontrols-gallery-drawer.png
new file mode 100644
index 00000000..57ec1026
Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-gallery-drawer.png differ
diff --git a/src/imports/controls/doc/images/qtlabscontrols-gallery-menu.png b/src/imports/controls/doc/images/qtlabscontrols-gallery-menu.png
new file mode 100644
index 00000000..5b34264e
Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-gallery-menu.png differ
diff --git a/src/imports/controls/doc/images/qtlabscontrols-gallery-welcome.png b/src/imports/controls/doc/images/qtlabscontrols-gallery-welcome.png
new file mode 100644
index 00000000..5c2bb682
Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-gallery-welcome.png differ
diff --git a/src/imports/controls/doc/qtlabscontrols.qdocconf b/src/imports/controls/doc/qtlabscontrols.qdocconf
index a8fcb049..df004294 100644
--- a/src/imports/controls/doc/qtlabscontrols.qdocconf
+++ b/src/imports/controls/doc/qtlabscontrols.qdocconf
@@ -28,14 +28,14 @@ depends = qtcore qtgui qtdoc qtqml qtquick qtquicklayouts qtquickdialogs qtquick
 # Specify the install path under QT_INSTALL_EXAMPLES
 # Note: paths passed to \example command must contain the parent directory, e.g.
 # \example controls/tabs
-exampledirs += ../../../../examples/labs \
+exampledirs += ../../../../examples/controls \
                ../ \
                ../../../templates \
                ../../calendar \
                ../../../../tests/auto/controls/data \
                snippets
 
-examplesinstallpath = qtquickcontrols2/labs
+examplesinstallpath = qtquickcontrols2/controls
 
 headerdirs += ../../../templates \
               ../../calendar \
diff --git a/src/imports/controls/doc/src/qtlabscontrols-examples.qdoc b/src/imports/controls/doc/src/qtlabscontrols-examples.qdoc
new file mode 100644
index 00000000..04aabcfa
--- /dev/null
+++ b/src/imports/controls/doc/src/qtlabscontrols-examples.qdoc
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 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$
+**
+****************************************************************************/
+
+/*!
+    \group qtlabscontrols-examples
+    \ingroup all-examples
+    \title Qt Labs Controls Examples
+    \brief A collection of examples for \l {Qt Labs Controls}
+
+    These examples demonstrate creating user interfaces using \l {Qt Labs Controls}.
+*/
+
+/*!
+    \example gallery
+    \title Qt Labs Controls - Gallery
+    \ingroup qtlabscontrols-examples
+    \brief A gallery of controls
+
+    \raw HTML
+    <div class="table"><table style="background:transparent; border:0px">
+    <tr><td style="border:0px">
+    \endraw
+    \image qtlabscontrols-gallery-welcome.png
+    \caption Welcome Screen
+    \raw HTML
+    </td><td style="border:0px">
+    \endraw
+    \image qtlabscontrols-gallery-drawer.png
+    \caption Side Drawer
+    \raw HTML
+    </td><td style="border:0px">
+    \endraw
+    \image qtlabscontrols-gallery-menu.png
+    \caption Options Menu
+    \raw HTML
+    </td></tr>
+    </table></div>
+    \endraw
+
+    This example project demonstrates the various UI controls provided by
+    \l {Qt Labs Controls}.
+
+    \include examples-run.qdocinc
+*/
-- 
cgit v1.2.3