From 93521943759a90aeda79e25d5e136be7a5ebe263 Mon Sep 17 00:00:00 2001
From: Sergio Ahumada <sahumada@blackberry.com>
Date: Tue, 25 Mar 2014 22:58:20 +0100
Subject: Doc: Fix some warnings in Qt Quick Controls
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Set 'exampledirs' to '../../../examples/quick/controls' instead, so
the files under 'examples/quick/dialogs' are not processed twice.

Also fix a small typo in BusyIndicatorStyle.qml

Change-Id: Id5b3ff144056ab37e4a9e9f52cd1811797c54fb1
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
---
 src/controls/Styles/Base/BusyIndicatorStyle.qml    |  2 +-
 src/controls/doc/qtquickcontrols.qdocconf          |  4 ++--
 src/controls/doc/src/qtquickcontrols-examples.qdoc | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/controls/Styles/Base/BusyIndicatorStyle.qml b/src/controls/Styles/Base/BusyIndicatorStyle.qml
index d9f0fdb4..6a6b36c0 100644
--- a/src/controls/Styles/Base/BusyIndicatorStyle.qml
+++ b/src/controls/Styles/Base/BusyIndicatorStyle.qml
@@ -54,7 +54,7 @@ import QtQuick.Controls.Private 1.0
     Example:
     \qml
     BusyIndicator {
-        style: BusyIndicatorStyle
+        style: BusyIndicatorStyle {
             indicator: Image {
                 visible: control.running
                 source: "spinner.png"
diff --git a/src/controls/doc/qtquickcontrols.qdocconf b/src/controls/doc/qtquickcontrols.qdocconf
index 4306477c..b3219d90 100644
--- a/src/controls/doc/qtquickcontrols.qdocconf
+++ b/src/controls/doc/qtquickcontrols.qdocconf
@@ -34,8 +34,8 @@ depends = qtqml qtquick qtgui qtwidgets qtdoc qtquicklayouts
 # Specify the install path under QT_INSTALL_EXAMPLES
 # Examples will be installed under quick/controls - 'controls' subdirectory
 # is given as part of \example commands
-exampledirs += ../../../examples/quick
-examplesinstallpath = quick
+exampledirs += ../../../examples/quick/controls
+examplesinstallpath = quick/controls
 
 headerdirs += ../ \
               Styles/Base
diff --git a/src/controls/doc/src/qtquickcontrols-examples.qdoc b/src/controls/doc/src/qtquickcontrols-examples.qdoc
index 1531e3ff..45b61598 100644
--- a/src/controls/doc/src/qtquickcontrols-examples.qdoc
+++ b/src/controls/doc/src/qtquickcontrols-examples.qdoc
@@ -36,7 +36,7 @@
 */
 
 /*!
-    \example controls/gallery
+    \example gallery
     \title Qt Quick Controls - Gallery
     \ingroup qtquickcontrols_examples
     \brief A collection of components for a classic desktop-style UI.
@@ -47,7 +47,7 @@
 */
 
 /*!
-    \example controls/basiclayouts
+    \example basiclayouts
     \title Qt Quick Controls - Basic Layouts Example
     \ingroup qtquickcontrols_examples
     \brief Demonstrates how to use layout types to arrange a UI
@@ -59,7 +59,7 @@
 */
 
 /*!
-    \example controls/splitview
+    \example splitview
     \title Qt Quick Controls - Split View Example
     \ingroup qtquickcontrols_examples
     \brief An example for the SplitView UI control.
@@ -71,7 +71,7 @@
 */
 
 /*!
-    \example controls/tableview
+    \example tableview
     \title Qt Quick Controls - Table View Example
     \ingroup qtquickcontrols_examples
     \brief An example for the TableView control.
@@ -84,7 +84,7 @@
 */
 
 /*!
-    \example controls/texteditor
+    \example texteditor
     \title Qt Quick Controls - Text Editor Example
     \ingroup qtquickcontrols_examples
     \brief A text editor application.
@@ -95,7 +95,7 @@
 */
 
 /*!
-    \example controls/touch
+    \example touch
     \title Qt Quick Controls - Touch Gallery
     \ingroup qtquickcontrols_examples
     \brief Demonstrates UI controls for a touch interface
@@ -106,7 +106,7 @@
 */
 
 /*!
-    \example controls/calendar
+    \example calendar
     \title Qt Quick Controls - Calendar Example
     \ingroup qtquickcontrols_examples
     \brief Demonstrates the use of Calendar to display events
-- 
cgit v1.2.1