Merge branch '4.7' into qmldocs

Conflicts:
	doc/src/snippets/declarative/qml-intro/basic-syntax.qml

5 files changed, 29 insertions, 78 deletions

diff --git a/doc/src/declarative/qml-intro.qdoc b/doc/src/declarative/qml-intro.qdoc
index 63d6825..9130be0 100644
--- a/doc/src/declarative/qml-intro.qdoc
+++ b/doc/src/declarative/qml-intro.qdoc
@@ -58,7 +58,12 @@ would be a property.
 
 The basic syntax of an \l{QML Elements}{element} is
 
-\snippet doc/src/snippets/declarative/qml-intro/basic-syntax.qml basic syntax
+\code
+SomeElement {
+    id: myObject
+    ... some other things here ...
+}
+\endcode
 
 Here we are defining a new object. We specify its 'type' first as SomeElement.
 Then within matching braces { ... } we specify the various parts of our 
diff --git a/doc/src/declarative/qmlruntime.qdoc b/doc/src/declarative/qmlruntime.qdoc
index d44e774..9a84237 100644
--- a/doc/src/declarative/qmlruntime.qdoc
+++ b/doc/src/declarative/qmlruntime.qdoc
@@ -104,20 +104,22 @@ can be constructed directly instead. In this case, \c application.qml is
 loaded as a QDeclarativeComponent instance rather than placed into a view:
 
 \code
-    #include <QCoreApplication>
+    #include <QApplication>
     #include <QDeclarativeEngine>    
+    #include <QDeclarativeContext>
+    #include <QDeclarativeComponent>
 
     int main(int argc, char *argv[])
     {
-        QCoreApplication app(argc, argv);
+        QApplication app(argc, argv);
     
         QDeclarativeEngine engine;
-        QDeclarativeContext *windowContext = new QDeclarativeContext(engine.rootContext());
+        QDeclarativeContext *objectContext = new QDeclarativeContext(engine.rootContext());
     
         QDeclarativeComponent component(&engine, "application.qml");
-        QObject *window = component.create(windowContext);
+        QObject *object = component.create(objectContext);
          
-        // ... delete window and windowContext when necessary
+        // ... delete object and objectContext when necessary
     
         return app.exec();
     }
diff --git a/doc/src/getting-started/gettingstartedqml.qdoc b/doc/src/getting-started/gettingstartedqml.qdoc
index 9e6471e..6cef316 100644
--- a/doc/src/getting-started/gettingstartedqml.qdoc
+++ b/doc/src/getting-started/gettingstartedqml.qdoc
@@ -404,13 +404,9 @@
 
     \image qml-texteditor2_menubar.png 
 
-    */
+    \section1 Building a Text Editor
 
-    /*!
-    \page qml-textEditor3.html
-    \title Building a Text Editor
-
-    \section1 Declaring a TextArea
+    \section2 Declaring a TextArea
 
     Our text editor is not a text editor if it didn't contain an editable text area.
     QML's \l {TextEdit}{TextEdit} element allows the declaration of a multi-line
@@ -451,7 +447,7 @@
         }
     \endcode
         
-    \section1 Combining Components for the Text Editor
+    \section2 Combining Components for the Text Editor
 
     We are now ready to create the layout of our text editor using QML. The text
     editor has two components, the menu bar we created and the text area. QML allows
@@ -494,12 +490,8 @@
 
     \image qml-texteditor3_texteditor.png 
 
-    */
-
-    /*!
-    \page qml-textEditor4
-    \title Decorating the Text Editor
-    \section1 Implementing a Drawer Interface
+    \section1 Decorating the Text Editor
+    \section2 Implementing a Drawer Interface
 
     Our text editor looks simple and we need to decorate it. Using QML, we can declare
     transitions and animate our text editor. Our menu bar is occupying one-third of the
@@ -652,7 +644,7 @@
     The first color starts at \c 0.0 and the last color is at \c 1.0.
 
 
-    \section2 Where to Go from Here
+    \section3 Where to Go from Here
 
         We are finished building the user interface of a very simple text editor.
         Going forward, the user interface is complete, and we can implement the
@@ -661,7 +653,7 @@
 
     \image qml-texteditor4_texteditor.png  
 
-    \section1 Extending QML using Qt C++
+    \section2 Extending QML using Qt C++
 
     Now that we have our text editor layout, we may now implement the text editor
     functionalities in C++. Using QML with C++ enables us to create our application
@@ -672,7 +664,7 @@
     we shall implement the load and save functions in C++ and export it as a plugin.
     This way, we only need to load the QML file directly instead of running an executable.
 
-    \section2 Exposing C++ Classes to QML 
+    \section3 Exposing C++ Classes to QML 
 
     We will be implementing file loading and saving using Qt and C++. C++ classes
     and functions can be used in QML by registering them. The class also needs to be
@@ -687,7 +679,7 @@
     \o A \c qmldir file telling the qmlviewer tool where to find the plugin
     \endlist
 
-    \section2 Building a Qt Plugin
+    \section3 Building a Qt Plugin
 
         To build a plugin, we need to set the following in a Qt project file. First,
         the necessary sources, headers, and Qt modules need to be added into our
@@ -721,7 +713,7 @@
     parent's \c plugins directory.
 
 
-    \section2 Registering a Class into QML
+    \section3 Registering a Class into QML
 
     \code
     In dialogPlugin.h:
@@ -771,7 +763,7 @@
     file to generate the necessary meta-object code.
 
 
-    \section2 Creating QML Properties in a C++ class
+    \section3 Creating QML Properties in a C++ class
 
         We can create QML elements and properties using C++ and
         \l {The Meta-Object System}{Qt's Meta-Object System}. We can implement
@@ -925,7 +917,7 @@
     \c make to build and transfer the plugin to the \c plugins directory.
 
 
-    \section2 Importing a Plugin in QML
+    \section3 Importing a Plugin in QML
 
         The qmlviewer tool imports files that are in the same directory as the
         application. We can also create a \c qmldir file containing the locations of
@@ -948,7 +940,7 @@
     \c TARGET field in the project file. The compiled plugin is in the \c plugins directory. 
 
 
-    \section2 Integrating a File Dialog into the File Menu
+    \section3 Integrating a File Dialog into the File Menu
 
         Our \c FileMenu needs to display the \c FileDialog element, containing a list of
         the text files in a directory thus allowing the user to select the file by
@@ -1038,7 +1030,7 @@
 
     \image qml-texteditor5_filemenu.png
 
-    \section1 Text Editor Completion
+    \section2 Text Editor Completion
 
     \image qml-texteditor5_newfile.png
 
diff --git a/doc/src/snippets/declarative/qml-intro/basic-syntax.qml b/doc/src/snippets/declarative/qml-intro/basic-syntax.qml
deleted file mode 100644
index 0a7d5f8..0000000
--- a/doc/src/snippets/declarative/qml-intro/basic-syntax.qml
+++ /dev/null
@@ -1,50 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// Note: this file is not intended to be run.
-
-import Qt 4.7
-
-//! [basic syntax]
-Item {
-    id: myObject
-    // ... some other things here ...
-}
-//! [basic syntax]
diff --git a/doc/src/snippets/declarative/qml-intro/sequential-animation3.qml b/doc/src/snippets/declarative/qml-intro/sequential-animation3.qml
index 1037b79..97c574b 100644
--- a/doc/src/snippets/declarative/qml-intro/sequential-animation3.qml
+++ b/doc/src/snippets/declarative/qml-intro/sequential-animation3.qml
@@ -41,6 +41,8 @@
 import Qt 4.7
 
 //! [document]
+import Qt 4.7
+
 Rectangle {
     id: mainRec
     width:  600