Move Qt Quick Widgets example and document it

Because QtQuickWidgets is part of Qt Quick module documentation,
its examples need to also be moved under the examples/quick
directory structure.

This change moves the example, creates minimal documentation
for it, and adds a link to it from the QQuickWidget class
reference.

Task-number: QTBUG-37272
Change-Id: Iffb67849f150b9aaf0edaef5852364e93f7752b8
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

11 files changed, 37 insertions, 3 deletions

diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro
index 1f96111b04..f39931bd94 100644
--- a/examples/quick/quick.pro
+++ b/examples/quick/quick.pro
@@ -26,7 +26,8 @@ SUBDIRS =   quick-accessibility \
 
 # Widget dependent examples
 qtHaveModule(widgets) {
-    SUBDIRS += embeddedinwidgets
+    SUBDIRS += embeddedinwidgets \
+               quickwidgets
 }
 
 EXAMPLE_FILES = \
diff --git a/examples/quick/quickwidgets/quickwidget/doc/images/qtquickwidgets-example.png b/examples/quick/quickwidgets/quickwidget/doc/images/qtquickwidgets-example.png
new file mode 100644
index 0000000000..cc4f52082f
--- /dev/null
+++ b/examples/quick/quickwidgets/quickwidget/doc/images/qtquickwidgets-example.png
diff --git a/examples/quick/quickwidgets/quickwidget/doc/src/quickwidget.qdoc b/examples/quick/quickwidgets/quickwidget/doc/src/quickwidget.qdoc
new file mode 100644
index 0000000000..8a89371039
--- /dev/null
+++ b/examples/quick/quickwidgets/quickwidget/doc/src/quickwidget.qdoc
@@ -0,0 +1,34 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** 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 Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/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$
+**
+****************************************************************************/
+
+/*!
+    \title Qt Quick Widgets Example
+    \example quickwidgets/quickwidget
+    \brief Demonstrates how to mix QML with a Qt Widgets application using the QQuickWidget class.
+    \image qtquickwidgets-example.png
+*/
+
diff --git a/examples/quickwidgets/quickwidget/main.cpp b/examples/quick/quickwidgets/quickwidget/main.cpp
index c1304347ec..c1304347ec 100644
--- a/examples/quickwidgets/quickwidget/main.cpp
+++ b/examples/quick/quickwidgets/quickwidget/main.cpp
diff --git a/examples/quick/quickwidgets/quickwidget/qtquickwidgets-example.png b/examples/quick/quickwidgets/quickwidget/qtquickwidgets-example.png
new file mode 100644
index 0000000000..cc4f52082f
--- /dev/null
+++ b/examples/quick/quickwidgets/quickwidget/qtquickwidgets-example.png
diff --git a/examples/quickwidgets/quickwidget/quickwidget.pro b/examples/quick/quickwidgets/quickwidget/quickwidget.pro
index 1aca22082e..1aca22082e 100644
--- a/examples/quickwidgets/quickwidget/quickwidget.pro
+++ b/examples/quick/quickwidgets/quickwidget/quickwidget.pro
diff --git a/examples/quickwidgets/quickwidget/quickwidget.qrc b/examples/quick/quickwidgets/quickwidget/quickwidget.qrc
index c073b7b80d..c073b7b80d 100644
--- a/examples/quickwidgets/quickwidget/quickwidget.qrc
+++ b/examples/quick/quickwidgets/quickwidget/quickwidget.qrc
diff --git a/examples/quickwidgets/quickwidget/rotatingsquare.qml b/examples/quick/quickwidgets/quickwidget/rotatingsquare.qml
index a5becfba38..a5becfba38 100644
--- a/examples/quickwidgets/quickwidget/rotatingsquare.qml
+++ b/examples/quick/quickwidgets/quickwidget/rotatingsquare.qml
diff --git a/examples/quickwidgets/quickwidgets.pro b/examples/quick/quickwidgets/quickwidgets.pro
index 07192b6696..07192b6696 100644
--- a/examples/quickwidgets/quickwidgets.pro
+++ b/examples/quick/quickwidgets/quickwidgets.pro
diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf
index 515263f079..edad14cfd4 100644
--- a/src/quick/doc/qtquick.qdocconf
+++ b/src/quick/doc/qtquick.qdocconf
@@ -44,7 +44,6 @@ sourcedirs  += .. \
                ../../quickwidgets
 
 exampledirs +=  ../../../examples/quick \
-                ../../../examples/quickwidgets \
                 snippets
 
 
diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp
index 46db2ddfeb..6484bf2fd2 100644
--- a/src/quickwidgets/qquickwidget.cpp
+++ b/src/quickwidgets/qquickwidget.cpp
@@ -225,7 +225,7 @@ void QQuickWidgetPrivate::renderSceneGraph()
     some of the benefits of threaded rendering, for example \l Animator classes and vsync driven
     animations, will not be available.
 
-    \sa {Exposing Attributes of C++ Types to QML}, QQuickView
+    \sa {Exposing Attributes of C++ Types to QML}, {Qt Quick Widgets Example}, QQuickView
 */