Doc: Reassigned types and pages to their correct modules.

1)Moved classes and basic types to \module QtQml 2.
-QQml* classes are in QtQml 2 for 5.1

2)Removed \inqmlmodule commands in overviews and tutorials.
-Only QML API should have \inqmlmodule commands because they are added
to the auto generated list of types.

Change-Id: I9aa3ca8062fa9fed76734885829879122841b119
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

7 files changed, 0 insertions, 19 deletions

diff --git a/src/quick/doc/src/advtutorial.qdoc b/src/quick/doc/src/advtutorial.qdoc
index 966233c371..a27cb78eba 100644
--- a/src/quick/doc/src/advtutorial.qdoc
+++ b/src/quick/doc/src/advtutorial.qdoc
@@ -27,7 +27,6 @@
 
 /*!
 \page qml-advtutorial.html tutorial
-\inqmlmodule QtQuick 2
 \title QML Advanced Tutorial
 \brief A more advanced tutorial, showing how to use QML to create a game.
 \nextpage QML Advanced Tutorial 1 - Creating the Game Canvas and Blocks
@@ -65,7 +64,6 @@ directory.
 
 /*!
 \page qml-advtutorial1.html
-\inqmlmodule QtQuick 2
 \title QML Advanced Tutorial 1 - Creating the Game Canvas and Blocks
 \contentspage QML Advanced Tutorial
 \previouspage QML Advanced Tutorial
@@ -135,7 +133,6 @@ types to get started. Next, we will populate the game canvas with some blocks.
 
 /*!
 \page qml-advtutorial2.html
-\inqmlmodule QtQuick 2
 \title QML Advanced Tutorial 2 - Populating the Game Canvas
 \contentspage QML Advanced Tutorial
 \previouspage QML Advanced Tutorial 1 - Creating the Game Canvas and Blocks
@@ -211,7 +208,6 @@ Now, we have a screen of blocks, and we can begin to add the game mechanics.
 
 /*!
 \page qml-advtutorial3.html
-\inqmlmodule QtQuick 2
 \title QML Advanced Tutorial 3 - Implementing the Game Logic
 \contentspage QML Advanced Tutorial
 \previouspage QML Advanced Tutorial 2 - Populating the Game Canvas
@@ -300,7 +296,6 @@ until the next chapter - where your application becomes alive!
 
 /*!
 \page qml-advtutorial4.html
-\inqmlmodule QtQuick 2
 \title QML Advanced Tutorial 4 - Finishing Touches
 \contentspage QML Advanced Tutorial
 \previouspage QML Advanced Tutorial 3 - Implementing the Game Logic
diff --git a/src/quick/doc/src/appdevguide/qtquicktest.qdoc b/src/quick/doc/src/appdevguide/qtquicktest.qdoc
index 6d434279e6..a5712cab8a 100644
--- a/src/quick/doc/src/appdevguide/qtquicktest.qdoc
+++ b/src/quick/doc/src/appdevguide/qtquicktest.qdoc
@@ -27,7 +27,6 @@
 
 /*!
     \page qtquick-qtquicktest.html
-    \inqmlmodule QtQuick 2
     \title Qt Quick Test Reference Documentation
     \brief unit testing framework for QML
 
diff --git a/src/quick/doc/src/concepts/effects/particles.qdoc b/src/quick/doc/src/concepts/effects/particles.qdoc
index 708e8d2740..ec49c6df43 100644
--- a/src/quick/doc/src/concepts/effects/particles.qdoc
+++ b/src/quick/doc/src/concepts/effects/particles.qdoc
@@ -44,7 +44,6 @@
 
 /*!
     \page qtquick-effects-particles.html
-    \inqmlmodule QtQuick.Particles 2.0
     \title Using the Qt Quick Particle System
 
     Documentation for all Particle System types can be found on the \l{QtQuick.Particles 2}{QtQuick.Particles} module page.
@@ -132,7 +131,6 @@
 
 /*!
     \page qtquick-particles-performance.html
-    \inqmlmodule QtQuick 2.0
     \title Particle System Performance Guide
 
     The performance of the particle system scales with the number of particles it is maintaining. After prototyping the desired
diff --git a/src/quick/doc/src/dynamicview-tutorial.qdoc b/src/quick/doc/src/dynamicview-tutorial.qdoc
index daa14a6973..a04f057c72 100644
--- a/src/quick/doc/src/dynamicview-tutorial.qdoc
+++ b/src/quick/doc/src/dynamicview-tutorial.qdoc
@@ -27,7 +27,6 @@
 
 /*!
 \page qml-dynamicview-tutorial.html tutorial
-\inqmlmodule QtQuick 2
 \title QML Dynamic View Ordering Tutorial
 \brief A tutorial describing how to re-arrange items in a QML ListView
 \nextpage QML Dynamic View Ordering Tutorial 1 - A Simple ListView and Delegate
@@ -51,7 +50,6 @@ directory.
 
 /*!
 \page qml-dynamicview-tutorial1.html
-\inqmlmodule QtQuick 2
 \title QML Dynamic View Ordering Tutorial 1 - A Simple ListView and Delegate
 \contentspage QML Dynamic View Ordering Tutorial
 \previouspage QML Dynamic View Ordering Tutorial
@@ -88,7 +86,6 @@ The second part of the application is the ListView itself to which we bind the m
 
 /*!
 \page qml-dynamicview-tutorial2.html
-\inqmlmodule QtQuick 2
 \title QML Dynamic View Ordering Tutorial 2 - Dragging View Items
 \contentspage QML Dynamic View Ordering Tutorial
 \previouspage QML Dynamic View Ordering Tutorial 1 - A Simple ListView and Delegate
@@ -133,7 +130,6 @@ so that is above other items in the stacking order and isn't obscured as it is d
 
 /*!
 \page qml-dynamicview-tutorial3.html
-\inqmlmodule QtQuick 2
 \title QML Dynamic View Ordering Tutorial 3 - Moving Dragged Items
 \contentspage QML Dynamic View Ordering Tutorial
 \previouspage QML Dynamic View Ordering Tutorial 2 - Dragging View Items
@@ -187,7 +183,6 @@ property of the view and bind the \l {QtQuick2::VisualDataModel::model}{model} a
 
 /*!
 \page qml-dynamicview-tutorial4.html
-\inqmlmodule QtQuick 2
 \title QML Dynamic View Ordering Tutorial 4 - Sorting Items
 \contentspage QML Dynamic View Ordering Tutorial
 \previouspage QML Dynamic View Ordering Tutorial 3 - Moving Dragged Items
diff --git a/src/quick/doc/src/examples.qdoc b/src/quick/doc/src/examples.qdoc
index aad8cfc3c4..6db53082fa 100644
--- a/src/quick/doc/src/examples.qdoc
+++ b/src/quick/doc/src/examples.qdoc
@@ -33,7 +33,6 @@
 \ingroup all-examples
 \ingroup qtquick
 \target qtquick-samples
-\inqmlmodule QtQuick 2
 
 These are code samples that show how to use various aspects of Qt Quick. Larger
 compound interfaces are grouped as applications as they demonstrate more Qt
diff --git a/src/quick/doc/src/tutorial.qdoc b/src/quick/doc/src/tutorial.qdoc
index b1f2304529..62098bc482 100644
--- a/src/quick/doc/src/tutorial.qdoc
+++ b/src/quick/doc/src/tutorial.qdoc
@@ -27,7 +27,6 @@
 
 /*!
 \page qml-tutorial.html
-\inqmlmodule QtQuick 2
 \title QML Tutorial
 \brief An introduction to the basic concepts and features of QML.
 \previouspage Introduction to the QML Language
@@ -55,7 +54,6 @@ Tutorial chapters:
 
 /*!
 \page qml-tutorial1.html
-\inqmlmodule QtQuick 2
 \title QML Tutorial 1 - Basic Types
 \contentspage QML Tutorial
 \previouspage QML Tutorial
@@ -114,7 +112,6 @@ qmlscene tutorials/helloworld/tutorial1.qml
 
 /*!
 \page qml-tutorial2.html
-\inqmlmodule QtQuick 2
 \title QML Tutorial 2 - QML Components
 \contentspage QML Tutorial
 \previouspage QML Tutorial 1 - Basic Types
@@ -187,7 +184,6 @@ We can react to any signal of our component through a property of the name \e 'o
 
 /*!
 \page qml-tutorial3.html
-\inqmlmodule QtQuick 2
 \title QML Tutorial 3 - States and Transitions
 \contentspage QML Tutorial
 \previouspage QML Tutorial 2 - QML Components
diff --git a/src/quick/doc/src/whatsnew.qdoc b/src/quick/doc/src/whatsnew.qdoc
index 3959a1b5eb..7651fceaaa 100644
--- a/src/quick/doc/src/whatsnew.qdoc
+++ b/src/quick/doc/src/whatsnew.qdoc
@@ -28,7 +28,6 @@
 /*!
 \title Qt Quick Release Notes
 \page qtquick-releasenotes.html
-\inqmlmodule QtQuick 2.0
 
 \section1 Qt 5.0 - QtQuick C++ Module