Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7

145 files changed, 230 insertions, 155 deletions

diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc
index f64da96..28a8a70 100644
--- a/doc/src/declarative/declarativeui.qdoc
+++ b/doc/src/declarative/declarativeui.qdoc
@@ -73,6 +73,7 @@ Module.
 \section1 Getting Started
 
 \list
+\o \l{What's new in Qt Quick}
 \o \l{Introduction to the QML language}
 \o \l{QML for Qt Programmers}
 \o \l{Getting Started Programming with QML}
diff --git a/doc/src/declarative/modules.qdoc b/doc/src/declarative/modules.qdoc
index 2339d66..b5a6be1 100644
--- a/doc/src/declarative/modules.qdoc
+++ b/doc/src/declarative/modules.qdoc
@@ -52,7 +52,7 @@ An \c import statement includes the module name, and possibly a version number.
 This can be seen in the snippet commonly found at the top of QML files:
 
 \qml
-    import Qt 4.7
+    import QtQuick 1.0
 \endqml
     
 This imports version 4.7 of the "Qt" module into the global namespace. (The QML 
@@ -126,7 +126,7 @@ application code. When importing an installed module, an un-quoted URI is
 used, with a mandatory version number:
 
 \code
-    import Qt 4.7
+    import QtQuick 1.0
     import com.nokia.qml.mymodule 1.0
 \endcode
 
@@ -181,7 +181,7 @@ By default, when a module is imported, its contents are imported into the global
 To import a module into a specific namespace, use the \e as keyword:
 
 \qml
-    import Qt 4.7 as QtLibrary
+    import QtQuick 1.0 as QtLibrary
     import "../MyComponents" as MyComponents
     import com.nokia.qml.mymodule 1.0 as MyModule
 \endqml
@@ -199,7 +199,7 @@ Types from these modules can then only be used when qualified by the namespace:
 Multiple modules can be imported into the same namespace in the same way that multiple modules can be imported into the global namespace:
 
 \qml
-    import Qt 4.7 as Nokia
+    import QtQuick 1.0 as Nokia
     import Ovi 1.0 as Nokia
 \endqml
 
diff --git a/doc/src/declarative/qdeclarativedebugging.qdoc b/doc/src/declarative/qdeclarativedebugging.qdoc
index 0a3050e..9e0a969 100644
--- a/doc/src/declarative/qdeclarativedebugging.qdoc
+++ b/doc/src/declarative/qdeclarativedebugging.qdoc
@@ -59,7 +59,7 @@ from QML's import loading mechanisms.
 For example, for a simple QML file like this:
 
 \qml
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle { width: 100; height: 100 }
 \endqml
diff --git a/doc/src/declarative/qdeclarativedocument.qdoc b/doc/src/declarative/qdeclarativedocument.qdoc
index 5717d87..8af24a6 100644
--- a/doc/src/declarative/qdeclarativedocument.qdoc
+++ b/doc/src/declarative/qdeclarativedocument.qdoc
@@ -82,7 +82,7 @@ Each instance is created with a different value for its \c text property:
 \o \snippet doc/src/snippets/declarative/qml-documents/qmldocuments.qml document
 \o 
 \qml
-import Qt 4.7
+import QtQuick 1.0
 
 Column {
     spacing: 10
diff --git a/doc/src/declarative/qdeclarativei18n.qdoc b/doc/src/declarative/qdeclarativei18n.qdoc
index b26a903..0d5fbcc 100644
--- a/doc/src/declarative/qdeclarativei18n.qdoc
+++ b/doc/src/declarative/qdeclarativei18n.qdoc
@@ -58,7 +58,7 @@ that needs to be translated is enclosed in a call to \c qsTr().
 
 hello.qml:
 \qml
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 200; height: 200
diff --git a/doc/src/declarative/qdeclarativeintro.qdoc b/doc/src/declarative/qdeclarativeintro.qdoc
index 3e45098..b9925ac 100644
--- a/doc/src/declarative/qdeclarativeintro.qdoc
+++ b/doc/src/declarative/qdeclarativeintro.qdoc
@@ -46,7 +46,7 @@ technologies like HTML and CSS, but it's not required.
 QML looks like this:
 
 \code
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 200
diff --git a/doc/src/declarative/qmlruntime.qdoc b/doc/src/declarative/qmlruntime.qdoc
index 131c738..dfc0ad9 100644
--- a/doc/src/declarative/qmlruntime.qdoc
+++ b/doc/src/declarative/qmlruntime.qdoc
@@ -60,7 +60,7 @@ QDeclarativeView is a QWidget-based class that is able to load QML files.
 For example, if there is a QML file, \c application.qml, like this:
 
 \qml
-    import Qt 4.7
+    import QtQuick 1.0
     
     Rectangle { width: 100; height: 100; color: "red" }
 \endqml
diff --git a/doc/src/declarative/qmlviewer.qdoc b/doc/src/declarative/qmlviewer.qdoc
index dc08d7b..82f1fec 100644
--- a/doc/src/declarative/qmlviewer.qdoc
+++ b/doc/src/declarative/qmlviewer.qdoc
@@ -118,7 +118,7 @@ For example, this QML document refers to a \c lottoNumbers property which does
 not actually exist within the document:
 
 \qml
-import Qt 4.7
+import QtQuick 1.0
 
 ListView {
     width: 200; height: 300
@@ -131,7 +131,7 @@ If within the document's directory, there is a "dummydata" directory which
 contains a \c lottoNumbers.qml file like this:
 
 \qml
-import Qt 4.7
+import QtQuick 1.0
 
 ListModel {
     ListElement { number: 23 }
@@ -146,7 +146,7 @@ Child properties are included when loaded from dummy data. The following documen
 refers to a \c clock.time property:
 
 \qml
-import Qt 4.7    
+import QtQuick 1.0    
 Text { text: clock.time }
 \endqml
     
@@ -154,7 +154,7 @@ The text value could be filled by a \c dummydata/clock.qml file with a \c time
 property in the root context:
 
 \qml
-import Qt 4.7    
+import QtQuick 1.0    
 QtObject { property int time: 54321 }
 \endqml
 
diff --git a/doc/src/declarative/qtbinding.qdoc b/doc/src/declarative/qtbinding.qdoc
index bc17bde..b78e5bf 100644
--- a/doc/src/declarative/qtbinding.qdoc
+++ b/doc/src/declarative/qtbinding.qdoc
@@ -188,7 +188,7 @@ is to have a "running" property in \c main.qml.  This leads to much nicer QML co
 \o
 \code
 // main.qml
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     MouseArea {
diff --git a/doc/src/declarative/scope.qdoc b/doc/src/declarative/scope.qdoc
index c702c91..b7ce539 100644
--- a/doc/src/declarative/scope.qdoc
+++ b/doc/src/declarative/scope.qdoc
@@ -112,7 +112,7 @@ following example shows a simple QML file that accesses some enumeration
 values and calls an imported JavaScript function.
 
 \code
-import Qt 4.7
+import QtQuick 1.0
 import "code.js" as Code
 
 ListView {
@@ -253,7 +253,7 @@ is used, the \c title property may resolve differently.
 
 \code
 // TitlePage.qml
-import Qt 4.7
+import QtQuick 1.0
 Item {
     property string title
     
@@ -269,7 +269,7 @@ Item {
 }
 
 // TitleText.qml
-import Qt 4.7
+import QtQuick 1.0
 Text {
     property int size
     text: "<b>" + title + "</b>"
@@ -285,7 +285,7 @@ to use property interfaces, like this:
 
 \code
 // TitlePage.qml
-import Qt 4.7
+import QtQuick 1.0
 Item {
     id: root
     property string title
@@ -304,7 +304,7 @@ Item {
 }
 
 // TitleText.qml
-import Qt 4.7
+import QtQuick 1.0
 Text {
     property string title
     property int size
diff --git a/doc/src/declarative/whatsnew.qdoc b/doc/src/declarative/whatsnew.qdoc
new file mode 100644
index 0000000..f8d1d0e
--- /dev/null
+++ b/doc/src/declarative/whatsnew.qdoc
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** 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 documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
+**
+** GNU Free Documentation License
+** 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\title What's new in Qt Quick
+\page qtquick-whatsnew.html
+
+\section1 4.7.1
+
+\section2 QtQuick namespace
+
+In prior Qt releases, all the Qt Quick elements were available in the \e Qt namespace.  
+Starting with Qt 4.7.1, the elements are also available in the \e QtQuick namespace, 
+which improves naming consistency, and allows the development of Qt Quick to occur at 
+a faster rate than Qt's usual minor release schedule.
+
+The change for developers is very simple - where you previously wrote \e {import Qt 4.7},
+just replace it with \e {import QtQuick 1.0}, like this:
+
+\code
+import QtQuick 1.0 
+
+Text {
+    text: "Welcome to QtQuick 1.0!"
+}
+\endcode
+
+\e {import Qt 4.7} continues to work so existing applications wont break even if they 
+aren't updated, but it is recommended that all import statements be modified to the new 
+form.
+*/
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index f340525..018362e 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -1088,7 +1088,7 @@
 
     For example:
 
-    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 146
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 152
 
     This will add the specified statements to the \c prj_exports section of the 
     generated \c bld.inf file.
diff --git a/doc/src/getting-started/gettingstartedqml.qdoc b/doc/src/getting-started/gettingstartedqml.qdoc
index 5e4a94f..9d4f6a7 100644
--- a/doc/src/getting-started/gettingstartedqml.qdoc
+++ b/doc/src/getting-started/gettingstartedqml.qdoc
@@ -73,7 +73,7 @@
 
     \snippet examples/tutorials/gettingStarted/gsQml/part0/Button.qml document
 
-    First, the \c { import Qt 4.7 } allows the qmlviewer tool to import the QML elements
+    First, the \c { import QtQuick 1.0 } allows the qmlviewer tool to import the QML elements
     we will later use. This line must exist for every QML file. Notice that the version
     of Qt modules is included in the import statement.
 
@@ -209,7 +209,7 @@
     \c FileMenu.qml.
 
     \code
-        import Qt 4.7                \\import the main Qt QML module
+        import QtQuick 1.0                \\import the main Qt QML module
         import "folderName"            \\import the contents of the folder    
         import "script.js" as Script        \\import a Javascript file and name it as Script
     \endcode
diff --git a/doc/src/platforms/symbian-introduction.qdoc b/doc/src/platforms/symbian-introduction.qdoc
index 8cc93ba..8932747 100644
--- a/doc/src/platforms/symbian-introduction.qdoc
+++ b/doc/src/platforms/symbian-introduction.qdoc
@@ -144,6 +144,8 @@
                                 Smart installer will attempt to download
                                 missing dependencies in addition to
                                 just installing the application.
+    \row \o \c unsigned_installer_sis \o Create unsigned \l{Smart Installer}{smart installer}
+                                         \c .sis file for project.
     \row \o \c stub_sis      \o Create a stub sis to allow upgradability of projects
                                 that are deployed in ROM
     \endtable
diff --git a/doc/src/snippets/code/doc_src_qmake-manual.qdoc b/doc/src/snippets/code/doc_src_qmake-manual.qdoc
index 4ac7d5e..8c35c3f 100644
--- a/doc/src/snippets/code/doc_src_qmake-manual.qdoc
+++ b/doc/src/snippets/code/doc_src_qmake-manual.qdoc
@@ -1002,3 +1002,10 @@ symbian {
 RSS_RULES.service_list += "uid = 0x12345678; datatype_list = \{\}; opaque_data = r_my_icon;"
 RSS_RULES.footer +="RESOURCE CAPTION_AND_ICON_INFO r_my_icon \{ icon_file =\"$$PWD/my_icon.svg\"; \}"
 //! [151]
+
+//! [152]
+my_exports = \
+    "foo.h /epoc32/include/mylib/foo.h" \
+    "bar.h /epoc32/include/mylib/bar.h"
+BLD_INF_RULES.prj_exports += my_exports
+//! [152]
diff --git a/doc/src/snippets/declarative/SelfDestroyingRect.qml b/doc/src/snippets/declarative/SelfDestroyingRect.qml
index 413c04e..f89588b 100644
--- a/doc/src/snippets/declarative/SelfDestroyingRect.qml
+++ b/doc/src/snippets/declarative/SelfDestroyingRect.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: rect
diff --git a/doc/src/snippets/declarative/Sprite.qml b/doc/src/snippets/declarative/Sprite.qml
index 3928c4d..3bcd599 100644
--- a/doc/src/snippets/declarative/Sprite.qml
+++ b/doc/src/snippets/declarative/Sprite.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle { width: 80; height: 50; color: "red" }
 //![0]
diff --git a/doc/src/snippets/declarative/anchoranimation.qml b/doc/src/snippets/declarative/anchoranimation.qml
index f149326..d8235f6 100644
--- a/doc/src/snippets/declarative/anchoranimation.qml
+++ b/doc/src/snippets/declarative/anchoranimation.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: container
diff --git a/doc/src/snippets/declarative/anchorchanges.qml b/doc/src/snippets/declarative/anchorchanges.qml
index 19356d7..66c31c5 100644
--- a/doc/src/snippets/declarative/anchorchanges.qml
+++ b/doc/src/snippets/declarative/anchorchanges.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: window
diff --git a/doc/src/snippets/declarative/animatedimage.qml b/doc/src/snippets/declarative/animatedimage.qml
index 66abbae..a9b58c5 100644
--- a/doc/src/snippets/declarative/animatedimage.qml
+++ b/doc/src/snippets/declarative/animatedimage.qml
@@ -42,7 +42,7 @@
 // examples/declarative/imageelements/animatedimage
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: animation.width; height: animation.height + 8
diff --git a/doc/src/snippets/declarative/animation-behavioral.qml b/doc/src/snippets/declarative/animation-behavioral.qml
index a4fa648..0462e9a 100644
--- a/doc/src/snippets/declarative/animation-behavioral.qml
+++ b/doc/src/snippets/declarative/animation-behavioral.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 100; height: 100
diff --git a/doc/src/snippets/declarative/animation-easing.qml b/doc/src/snippets/declarative/animation-easing.qml
index 97f6e60..3438737 100644
--- a/doc/src/snippets/declarative/animation-easing.qml
+++ b/doc/src/snippets/declarative/animation-easing.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 100; height: 100
diff --git a/doc/src/snippets/declarative/animation-elements.qml b/doc/src/snippets/declarative/animation-elements.qml
index a65bd67..7843b75 100644
--- a/doc/src/snippets/declarative/animation-elements.qml
+++ b/doc/src/snippets/declarative/animation-elements.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Row {
 
diff --git a/doc/src/snippets/declarative/animation-groups.qml b/doc/src/snippets/declarative/animation-groups.qml
index ba546c9..57cc8c2 100644
--- a/doc/src/snippets/declarative/animation-groups.qml
+++ b/doc/src/snippets/declarative/animation-groups.qml
@@ -37,7 +37,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 
 Row {
 
diff --git a/doc/src/snippets/declarative/animation-propertyvaluesource.qml b/doc/src/snippets/declarative/animation-propertyvaluesource.qml
index 366505c..ba56afd 100644
--- a/doc/src/snippets/declarative/animation-propertyvaluesource.qml
+++ b/doc/src/snippets/declarative/animation-propertyvaluesource.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 100; height: 100
diff --git a/doc/src/snippets/declarative/animation-signalhandler.qml b/doc/src/snippets/declarative/animation-signalhandler.qml
index 492c007..16f27c6 100644
--- a/doc/src/snippets/declarative/animation-signalhandler.qml
+++ b/doc/src/snippets/declarative/animation-signalhandler.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: rect
diff --git a/doc/src/snippets/declarative/animation-standalone.qml b/doc/src/snippets/declarative/animation-standalone.qml
index c847d02..1ff4073 100644
--- a/doc/src/snippets/declarative/animation-standalone.qml
+++ b/doc/src/snippets/declarative/animation-standalone.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: rect
diff --git a/doc/src/snippets/declarative/animation-transitions.qml b/doc/src/snippets/declarative/animation-transitions.qml
index 5b0bb84..025fc90 100644
--- a/doc/src/snippets/declarative/animation-transitions.qml
+++ b/doc/src/snippets/declarative/animation-transitions.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: rect
diff --git a/doc/src/snippets/declarative/behavior.qml b/doc/src/snippets/declarative/behavior.qml
index 7f66e5a..7e2d1e7 100644
--- a/doc/src/snippets/declarative/behavior.qml
+++ b/doc/src/snippets/declarative/behavior.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: rect
diff --git a/doc/src/snippets/declarative/borderimage/borderimage-scaled.qml b/doc/src/snippets/declarative/borderimage/borderimage-scaled.qml
index 0ed9943..ba30491 100644
--- a/doc/src/snippets/declarative/borderimage/borderimage-scaled.qml
+++ b/doc/src/snippets/declarative/borderimage/borderimage-scaled.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: page
diff --git a/doc/src/snippets/declarative/borderimage/borderimage-tiled.qml b/doc/src/snippets/declarative/borderimage/borderimage-tiled.qml
index 680709d..98a4175 100644
--- a/doc/src/snippets/declarative/borderimage/borderimage-tiled.qml
+++ b/doc/src/snippets/declarative/borderimage/borderimage-tiled.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: page
diff --git a/doc/src/snippets/declarative/borderimage/normal-image.qml b/doc/src/snippets/declarative/borderimage/normal-image.qml
index 85a7f52..f8e3c60 100644
--- a/doc/src/snippets/declarative/borderimage/normal-image.qml
+++ b/doc/src/snippets/declarative/borderimage/normal-image.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: page
diff --git a/doc/src/snippets/declarative/codingconventions/dotproperties.qml b/doc/src/snippets/declarative/codingconventions/dotproperties.qml
index 8a173cd..98cb09c 100644
--- a/doc/src/snippets/declarative/codingconventions/dotproperties.qml
+++ b/doc/src/snippets/declarative/codingconventions/dotproperties.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
 
diff --git a/doc/src/snippets/declarative/codingconventions/javascript-imports.qml b/doc/src/snippets/declarative/codingconventions/javascript-imports.qml
index 391bf27..931349f 100644
--- a/doc/src/snippets/declarative/codingconventions/javascript-imports.qml
+++ b/doc/src/snippets/declarative/codingconventions/javascript-imports.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 //![0]
 import "myscript.js" as Script
diff --git a/doc/src/snippets/declarative/codingconventions/javascript.qml b/doc/src/snippets/declarative/codingconventions/javascript.qml
index 90790b9..6c94626 100644
--- a/doc/src/snippets/declarative/codingconventions/javascript.qml
+++ b/doc/src/snippets/declarative/codingconventions/javascript.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
 
diff --git a/doc/src/snippets/declarative/codingconventions/lists.qml b/doc/src/snippets/declarative/codingconventions/lists.qml
index 8d2bdbc..a7f3c8f 100644
--- a/doc/src/snippets/declarative/codingconventions/lists.qml
+++ b/doc/src/snippets/declarative/codingconventions/lists.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     Item {
diff --git a/doc/src/snippets/declarative/codingconventions/photo.qml b/doc/src/snippets/declarative/codingconventions/photo.qml
index 359a756..2eba035 100644
--- a/doc/src/snippets/declarative/codingconventions/photo.qml
+++ b/doc/src/snippets/declarative/codingconventions/photo.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 //! [0]
 Rectangle {
diff --git a/doc/src/snippets/declarative/coloranimation.qml b/doc/src/snippets/declarative/coloranimation.qml
index d904721..452599e 100644
--- a/doc/src/snippets/declarative/coloranimation.qml
+++ b/doc/src/snippets/declarative/coloranimation.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 100; height: 100
diff --git a/doc/src/snippets/declarative/column/column.qml b/doc/src/snippets/declarative/column/column.qml
index 6d378bb..45c6822 100644
--- a/doc/src/snippets/declarative/column/column.qml
+++ b/doc/src/snippets/declarative/column/column.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 310; height: 170
diff --git a/doc/src/snippets/declarative/column/vertical-positioner-transition.qml b/doc/src/snippets/declarative/column/vertical-positioner-transition.qml
index 7785776..cd2fdcc 100644
--- a/doc/src/snippets/declarative/column/vertical-positioner-transition.qml
+++ b/doc/src/snippets/declarative/column/vertical-positioner-transition.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 //! [document]
 Column {
diff --git a/doc/src/snippets/declarative/column/vertical-positioner.qml b/doc/src/snippets/declarative/column/vertical-positioner.qml
index 86ecc55..693734b 100644
--- a/doc/src/snippets/declarative/column/vertical-positioner.qml
+++ b/doc/src/snippets/declarative/column/vertical-positioner.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 //! [document]
 Column {
diff --git a/doc/src/snippets/declarative/comments.qml b/doc/src/snippets/declarative/comments.qml
index aa034c6..a8e47ad 100644
--- a/doc/src/snippets/declarative/comments.qml
+++ b/doc/src/snippets/declarative/comments.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 //![0]
 Text {
diff --git a/doc/src/snippets/declarative/component.qml b/doc/src/snippets/declarative/component.qml
index 84c063f..ed55803 100644
--- a/doc/src/snippets/declarative/component.qml
+++ b/doc/src/snippets/declarative/component.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 100; height: 100
diff --git a/doc/src/snippets/declarative/createComponent-simple.qml b/doc/src/snippets/declarative/createComponent-simple.qml
index f4c240d..f052529 100644
--- a/doc/src/snippets/declarative/createComponent-simple.qml
+++ b/doc/src/snippets/declarative/createComponent-simple.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: container
diff --git a/doc/src/snippets/declarative/createComponent.qml b/doc/src/snippets/declarative/createComponent.qml
index f1a7436..619c02d 100644
--- a/doc/src/snippets/declarative/createComponent.qml
+++ b/doc/src/snippets/declarative/createComponent.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 import "componentCreation.js" as MyScript
 
 Rectangle {
diff --git a/doc/src/snippets/declarative/createQmlObject.qml b/doc/src/snippets/declarative/createQmlObject.qml
index 6a4eae8..cfcffe1 100644
--- a/doc/src/snippets/declarative/createQmlObject.qml
+++ b/doc/src/snippets/declarative/createQmlObject.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: parentItem
@@ -48,7 +48,7 @@ Rectangle {
     
     function createIt() {
 //![0]
-var newObject = Qt.createQmlObject('import Qt 4.7; Rectangle {color: "red"; width: 20; height: 20}',
+var newObject = Qt.createQmlObject('import QtQuick 1.0; Rectangle {color: "red"; width: 20; height: 20}',
     parentItem, "dynamicSnippet1");
 //![0]
 
diff --git a/doc/src/snippets/declarative/dynamicObjects-destroy.qml b/doc/src/snippets/declarative/dynamicObjects-destroy.qml
index b4ae80c..665f631 100644
--- a/doc/src/snippets/declarative/dynamicObjects-destroy.qml
+++ b/doc/src/snippets/declarative/dynamicObjects-destroy.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: container
diff --git a/doc/src/snippets/declarative/flickable.qml b/doc/src/snippets/declarative/flickable.qml
index a283e9a..80e7301 100644
--- a/doc/src/snippets/declarative/flickable.qml
+++ b/doc/src/snippets/declarative/flickable.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Flickable {
     width: 200; height: 200
diff --git a/doc/src/snippets/declarative/flickableScrollbar.qml b/doc/src/snippets/declarative/flickableScrollbar.qml
index fc06f63..18ea45a 100644
--- a/doc/src/snippets/declarative/flickableScrollbar.qml
+++ b/doc/src/snippets/declarative/flickableScrollbar.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 //![0]
 Rectangle {
diff --git a/doc/src/snippets/declarative/flipable/flipable.qml b/doc/src/snippets/declarative/flipable/flipable.qml
index eaf367a..cd5da4b 100644
--- a/doc/src/snippets/declarative/flipable/flipable.qml
+++ b/doc/src/snippets/declarative/flipable/flipable.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [0]
-import Qt 4.7
+import QtQuick 1.0
 
 Flipable {
     id: flipable
diff --git a/doc/src/snippets/declarative/flow-diagram.qml b/doc/src/snippets/declarative/flow-diagram.qml
index f34e3fd..c970164 100644
--- a/doc/src/snippets/declarative/flow-diagram.qml
+++ b/doc/src/snippets/declarative/flow-diagram.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "lightblue"
diff --git a/doc/src/snippets/declarative/flow.qml b/doc/src/snippets/declarative/flow.qml
index 809627e..167cbdb 100644
--- a/doc/src/snippets/declarative/flow.qml
+++ b/doc/src/snippets/declarative/flow.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "lightblue"
diff --git a/doc/src/snippets/declarative/focusscopes.qml b/doc/src/snippets/declarative/focusscopes.qml
index da6a850..4713c0c 100644
--- a/doc/src/snippets/declarative/focusscopes.qml
+++ b/doc/src/snippets/declarative/focusscopes.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 //![0]
 Rectangle {
diff --git a/doc/src/snippets/declarative/folderlistmodel.qml b/doc/src/snippets/declarative/folderlistmodel.qml
index a5e0071..d1cd34b 100644
--- a/doc/src/snippets/declarative/folderlistmodel.qml
+++ b/doc/src/snippets/declarative/folderlistmodel.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.folderlistmodel 1.0
 
 ListView {
diff --git a/doc/src/snippets/declarative/gradient.qml b/doc/src/snippets/declarative/gradient.qml
index 4c8bd40..47165a4 100644
--- a/doc/src/snippets/declarative/gradient.qml
+++ b/doc/src/snippets/declarative/gradient.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 //![code]
 Rectangle {
diff --git a/doc/src/snippets/declarative/grid/grid-items.qml b/doc/src/snippets/declarative/grid/grid-items.qml
index 2382d38..62a444d 100644
--- a/doc/src/snippets/declarative/grid/grid-items.qml
+++ b/doc/src/snippets/declarative/grid/grid-items.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 112; height: 112
diff --git a/doc/src/snippets/declarative/grid/grid-no-spacing.qml b/doc/src/snippets/declarative/grid/grid-no-spacing.qml
index 6318165..a6ca305 100644
--- a/doc/src/snippets/declarative/grid/grid-no-spacing.qml
+++ b/doc/src/snippets/declarative/grid/grid-no-spacing.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 112; height: 112
diff --git a/doc/src/snippets/declarative/grid/grid-spacing.qml b/doc/src/snippets/declarative/grid/grid-spacing.qml
index fb3822c..c03cdad 100644
--- a/doc/src/snippets/declarative/grid/grid-spacing.qml
+++ b/doc/src/snippets/declarative/grid/grid-spacing.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 112; height: 112
diff --git a/doc/src/snippets/declarative/grid/grid.qml b/doc/src/snippets/declarative/grid/grid.qml
index 4599806..837ae60 100644
--- a/doc/src/snippets/declarative/grid/grid.qml
+++ b/doc/src/snippets/declarative/grid/grid.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Grid {
     columns: 3
diff --git a/doc/src/snippets/declarative/gridview/ContactModel.qml b/doc/src/snippets/declarative/gridview/ContactModel.qml
index 9fdeb4a..c3c3962 100644
--- a/doc/src/snippets/declarative/gridview/ContactModel.qml
+++ b/doc/src/snippets/declarative/gridview/ContactModel.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 ListModel {
 
diff --git a/doc/src/snippets/declarative/gridview/gridview.qml b/doc/src/snippets/declarative/gridview/gridview.qml
index cbebb0a..73e58ec 100644
--- a/doc/src/snippets/declarative/gridview/gridview.qml
+++ b/doc/src/snippets/declarative/gridview/gridview.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![import]
-import Qt 4.7
+import QtQuick 1.0
 //![import]
 
 Rectangle {
diff --git a/doc/src/snippets/declarative/image.qml b/doc/src/snippets/declarative/image.qml
index 228e83a..4c66ec1 100644
--- a/doc/src/snippets/declarative/image.qml
+++ b/doc/src/snippets/declarative/image.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Image {
     source: "pics/qtlogo.png"
diff --git a/doc/src/snippets/declarative/listmodel-modify.qml b/doc/src/snippets/declarative/listmodel-modify.qml
index f08137f..d85da6c 100644
--- a/doc/src/snippets/declarative/listmodel-modify.qml
+++ b/doc/src/snippets/declarative/listmodel-modify.qml
@@ -37,7 +37,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 200; height: 200
diff --git a/doc/src/snippets/declarative/listmodel-nested.qml b/doc/src/snippets/declarative/listmodel-nested.qml
index c38ee2d..36c5d66 100644
--- a/doc/src/snippets/declarative/listmodel-nested.qml
+++ b/doc/src/snippets/declarative/listmodel-nested.qml
@@ -37,7 +37,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 200; height: 200
diff --git a/doc/src/snippets/declarative/listmodel-simple.qml b/doc/src/snippets/declarative/listmodel-simple.qml
index e561284..c8e83eb 100644
--- a/doc/src/snippets/declarative/listmodel-simple.qml
+++ b/doc/src/snippets/declarative/listmodel-simple.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 200; height: 200
diff --git a/doc/src/snippets/declarative/listmodel.qml b/doc/src/snippets/declarative/listmodel.qml
index 20f2074..f5b6cd6 100644
--- a/doc/src/snippets/declarative/listmodel.qml
+++ b/doc/src/snippets/declarative/listmodel.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 ListModel {
     id: fruitModel
diff --git a/doc/src/snippets/declarative/listview/ContactModel.qml b/doc/src/snippets/declarative/listview/ContactModel.qml
index f48f84f..d421ffc 100644
--- a/doc/src/snippets/declarative/listview/ContactModel.qml
+++ b/doc/src/snippets/declarative/listview/ContactModel.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 ListModel {
     ListElement {
diff --git a/doc/src/snippets/declarative/listview/listview-snippet.qml b/doc/src/snippets/declarative/listview/listview-snippet.qml
index d81bcbb..f2a260d 100644
--- a/doc/src/snippets/declarative/listview/listview-snippet.qml
+++ b/doc/src/snippets/declarative/listview/listview-snippet.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 ListView {
     width: 50; height: 200
diff --git a/doc/src/snippets/declarative/listview/listview.qml b/doc/src/snippets/declarative/listview/listview.qml
index 2945b2f..8ba47a8 100644
--- a/doc/src/snippets/declarative/listview/listview.qml
+++ b/doc/src/snippets/declarative/listview/listview.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![import]
-import Qt 4.7
+import QtQuick 1.0
 //![import]
 
 Item {
diff --git a/doc/src/snippets/declarative/loader/KeyReader.qml b/doc/src/snippets/declarative/loader/KeyReader.qml
index 66a74fa..e53700c 100644
--- a/doc/src/snippets/declarative/loader/KeyReader.qml
+++ b/doc/src/snippets/declarative/loader/KeyReader.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     Item {
diff --git a/doc/src/snippets/declarative/loader/MyItem.qml b/doc/src/snippets/declarative/loader/MyItem.qml
index 22c3fd3..199c64a 100644
--- a/doc/src/snippets/declarative/loader/MyItem.qml
+++ b/doc/src/snippets/declarative/loader/MyItem.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
    id: myItem
diff --git a/doc/src/snippets/declarative/loader/connections.qml b/doc/src/snippets/declarative/loader/connections.qml
index a1cdce2..18f4259 100644
--- a/doc/src/snippets/declarative/loader/connections.qml
+++ b/doc/src/snippets/declarative/loader/connections.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 100; height: 100
diff --git a/doc/src/snippets/declarative/loader/focus.qml b/doc/src/snippets/declarative/loader/focus.qml
index 4b4c940..4b3042a 100644
--- a/doc/src/snippets/declarative/loader/focus.qml
+++ b/doc/src/snippets/declarative/loader/focus.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 200; height: 200
diff --git a/doc/src/snippets/declarative/loader/simple.qml b/doc/src/snippets/declarative/loader/simple.qml
index bb06ffc..556ce60 100644
--- a/doc/src/snippets/declarative/loader/simple.qml
+++ b/doc/src/snippets/declarative/loader/simple.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 200; height: 200
diff --git a/doc/src/snippets/declarative/mousearea/mousearea-snippet.qml b/doc/src/snippets/declarative/mousearea/mousearea-snippet.qml
index 85071f1..e2a4ee9 100644
--- a/doc/src/snippets/declarative/mousearea/mousearea-snippet.qml
+++ b/doc/src/snippets/declarative/mousearea/mousearea-snippet.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle { 
     width: 100; height: 100
diff --git a/doc/src/snippets/declarative/mousearea/mousearea.qml b/doc/src/snippets/declarative/mousearea/mousearea.qml
index e7764f9..7cd0a77 100644
--- a/doc/src/snippets/declarative/mousearea/mousearea.qml
+++ b/doc/src/snippets/declarative/mousearea/mousearea.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [import]
-import Qt 4.7
+import QtQuick 1.0
 //! [import]
 
 Rectangle {
diff --git a/doc/src/snippets/declarative/mousearea/mouseareadragfilter.qml b/doc/src/snippets/declarative/mousearea/mouseareadragfilter.qml
index fa0682e..8f9fd47 100644
--- a/doc/src/snippets/declarative/mousearea/mouseareadragfilter.qml
+++ b/doc/src/snippets/declarative/mousearea/mouseareadragfilter.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [dragfilter]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 480
diff --git a/doc/src/snippets/declarative/numberanimation.qml b/doc/src/snippets/declarative/numberanimation.qml
index 19c0b0d..8f64493 100644
--- a/doc/src/snippets/declarative/numberanimation.qml
+++ b/doc/src/snippets/declarative/numberanimation.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 100; height: 100
diff --git a/doc/src/snippets/declarative/parallelanimation.qml b/doc/src/snippets/declarative/parallelanimation.qml
index caf4e01..0badc03 100644
--- a/doc/src/snippets/declarative/parallelanimation.qml
+++ b/doc/src/snippets/declarative/parallelanimation.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: rect
diff --git a/doc/src/snippets/declarative/parentanimation.qml b/doc/src/snippets/declarative/parentanimation.qml
index b8a4c00..fa49d7a 100644
--- a/doc/src/snippets/declarative/parentanimation.qml
+++ b/doc/src/snippets/declarative/parentanimation.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 200; height: 100
diff --git a/doc/src/snippets/declarative/parentchange.qml b/doc/src/snippets/declarative/parentchange.qml
index 72932b2..e73bbb3 100644
--- a/doc/src/snippets/declarative/parentchange.qml
+++ b/doc/src/snippets/declarative/parentchange.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 200; height: 100
diff --git a/doc/src/snippets/declarative/pathview/ContactModel.qml b/doc/src/snippets/declarative/pathview/ContactModel.qml
index 62daf3d..07db8dc 100644
--- a/doc/src/snippets/declarative/pathview/ContactModel.qml
+++ b/doc/src/snippets/declarative/pathview/ContactModel.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 ListModel {
     ListElement {
diff --git a/doc/src/snippets/declarative/pathview/pathattributes.qml b/doc/src/snippets/declarative/pathview/pathattributes.qml
index a45f15a..d6dacdb 100644
--- a/doc/src/snippets/declarative/pathview/pathattributes.qml
+++ b/doc/src/snippets/declarative/pathview/pathattributes.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 240; height: 200
diff --git a/doc/src/snippets/declarative/pathview/pathview.qml b/doc/src/snippets/declarative/pathview/pathview.qml
index e03c615..93298c4 100644
--- a/doc/src/snippets/declarative/pathview/pathview.qml
+++ b/doc/src/snippets/declarative/pathview/pathview.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 240; height: 200
diff --git a/doc/src/snippets/declarative/propertyaction.qml b/doc/src/snippets/declarative/propertyaction.qml
index 696c9ef..acb5c43 100644
--- a/doc/src/snippets/declarative/propertyaction.qml
+++ b/doc/src/snippets/declarative/propertyaction.qml
@@ -37,7 +37,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 
 Row {
 
diff --git a/doc/src/snippets/declarative/propertyanimation.qml b/doc/src/snippets/declarative/propertyanimation.qml
index 24efd60..1f1cbaf 100644
--- a/doc/src/snippets/declarative/propertyanimation.qml
+++ b/doc/src/snippets/declarative/propertyanimation.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Row {
 
diff --git a/doc/src/snippets/declarative/propertychanges.qml b/doc/src/snippets/declarative/propertychanges.qml
index 06a3fae..00f6bfe 100644
--- a/doc/src/snippets/declarative/propertychanges.qml
+++ b/doc/src/snippets/declarative/propertychanges.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![import]
-import Qt 4.7
+import QtQuick 1.0
 //![import]
 
 Column {
diff --git a/doc/src/snippets/declarative/qml-data-models/dynamic-listmodel.qml b/doc/src/snippets/declarative/qml-data-models/dynamic-listmodel.qml
index 48f2bdb..4aa318c 100644
--- a/doc/src/snippets/declarative/qml-data-models/dynamic-listmodel.qml
+++ b/doc/src/snippets/declarative/qml-data-models/dynamic-listmodel.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 200; height: 250
diff --git a/doc/src/snippets/declarative/qml-data-models/listelements.qml b/doc/src/snippets/declarative/qml-data-models/listelements.qml
index 2d12567..44fb056 100644
--- a/doc/src/snippets/declarative/qml-data-models/listelements.qml
+++ b/doc/src/snippets/declarative/qml-data-models/listelements.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 200; height: 250
diff --git a/doc/src/snippets/declarative/qml-data-models/listmodel-listview.qml b/doc/src/snippets/declarative/qml-data-models/listmodel-listview.qml
index 69533c9..53f844a 100644
--- a/doc/src/snippets/declarative/qml-data-models/listmodel-listview.qml
+++ b/doc/src/snippets/declarative/qml-data-models/listmodel-listview.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 200; height: 250
diff --git a/doc/src/snippets/declarative/qml-documents/inline-component.qml b/doc/src/snippets/declarative/qml-documents/inline-component.qml
index 45d7eb4..eef68a3 100644
--- a/doc/src/snippets/declarative/qml-documents/inline-component.qml
+++ b/doc/src/snippets/declarative/qml-documents/inline-component.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 240; height: 320; 
diff --git a/doc/src/snippets/declarative/qml-documents/inline-text-component.qml b/doc/src/snippets/declarative/qml-documents/inline-text-component.qml
index 1f3af33..593862d 100644
--- a/doc/src/snippets/declarative/qml-documents/inline-text-component.qml
+++ b/doc/src/snippets/declarative/qml-documents/inline-text-component.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 240; height: 320; 
diff --git a/doc/src/snippets/declarative/qml-documents/non-trivial.qml b/doc/src/snippets/declarative/qml-documents/non-trivial.qml
index e9cba98..ba567b5 100644
--- a/doc/src/snippets/declarative/qml-documents/non-trivial.qml
+++ b/doc/src/snippets/declarative/qml-documents/non-trivial.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 240; height: 320; 
diff --git a/doc/src/snippets/declarative/qml-documents/qmldocuments.qml b/doc/src/snippets/declarative/qml-documents/qmldocuments.qml
index a4b5589..20efc35 100644
--- a/doc/src/snippets/declarative/qml-documents/qmldocuments.qml
+++ b/doc/src/snippets/declarative/qml-documents/qmldocuments.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     property alias text: textItem.text
diff --git a/doc/src/snippets/declarative/qml-intro/anchors1.qml b/doc/src/snippets/declarative/qml-intro/anchors1.qml
index ba6f928..077eab2 100644
--- a/doc/src/snippets/declarative/qml-intro/anchors1.qml
+++ b/doc/src/snippets/declarative/qml-intro/anchors1.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: myWin
diff --git a/doc/src/snippets/declarative/qml-intro/anchors2.qml b/doc/src/snippets/declarative/qml-intro/anchors2.qml
index ac60e1b..79f180d 100644
--- a/doc/src/snippets/declarative/qml-intro/anchors2.qml
+++ b/doc/src/snippets/declarative/qml-intro/anchors2.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: myWin
diff --git a/doc/src/snippets/declarative/qml-intro/anchors3.qml b/doc/src/snippets/declarative/qml-intro/anchors3.qml
index ab74670..db42e6b 100644
--- a/doc/src/snippets/declarative/qml-intro/anchors3.qml
+++ b/doc/src/snippets/declarative/qml-intro/anchors3.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: myWin
diff --git a/doc/src/snippets/declarative/qml-intro/hello-world1.qml b/doc/src/snippets/declarative/qml-intro/hello-world1.qml
index 55b39c6..176f4f4 100644
--- a/doc/src/snippets/declarative/qml-intro/hello-world1.qml
+++ b/doc/src/snippets/declarative/qml-intro/hello-world1.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: myRectangle
diff --git a/doc/src/snippets/declarative/qml-intro/hello-world2.qml b/doc/src/snippets/declarative/qml-intro/hello-world2.qml
index c537528..98f04ec 100644
--- a/doc/src/snippets/declarative/qml-intro/hello-world2.qml
+++ b/doc/src/snippets/declarative/qml-intro/hello-world2.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: myRectangle
diff --git a/doc/src/snippets/declarative/qml-intro/hello-world3.qml b/doc/src/snippets/declarative/qml-intro/hello-world3.qml
index 794c406..abf684c 100644
--- a/doc/src/snippets/declarative/qml-intro/hello-world3.qml
+++ b/doc/src/snippets/declarative/qml-intro/hello-world3.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: myRectangle
diff --git a/doc/src/snippets/declarative/qml-intro/hello-world4.qml b/doc/src/snippets/declarative/qml-intro/hello-world4.qml
index 7ea4bed..de794ca 100644
--- a/doc/src/snippets/declarative/qml-intro/hello-world4.qml
+++ b/doc/src/snippets/declarative/qml-intro/hello-world4.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: myRectangle
diff --git a/doc/src/snippets/declarative/qml-intro/hello-world5.qml b/doc/src/snippets/declarative/qml-intro/hello-world5.qml
index 3345882..95ec6c8 100644
--- a/doc/src/snippets/declarative/qml-intro/hello-world5.qml
+++ b/doc/src/snippets/declarative/qml-intro/hello-world5.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: myRectangle
diff --git a/doc/src/snippets/declarative/qml-intro/number-animation1.qml b/doc/src/snippets/declarative/qml-intro/number-animation1.qml
index 64ebe7a..aa5c109 100644
--- a/doc/src/snippets/declarative/qml-intro/number-animation1.qml
+++ b/doc/src/snippets/declarative/qml-intro/number-animation1.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: mainRec
diff --git a/doc/src/snippets/declarative/qml-intro/number-animation2.qml b/doc/src/snippets/declarative/qml-intro/number-animation2.qml
index 7905002..9c6a4bc 100644
--- a/doc/src/snippets/declarative/qml-intro/number-animation2.qml
+++ b/doc/src/snippets/declarative/qml-intro/number-animation2.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: mainRec
diff --git a/doc/src/snippets/declarative/qml-intro/rectangle.qml b/doc/src/snippets/declarative/qml-intro/rectangle.qml
index 1ce0a04..ccfa514 100644
--- a/doc/src/snippets/declarative/qml-intro/rectangle.qml
+++ b/doc/src/snippets/declarative/qml-intro/rectangle.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 // This is a comment. And below myRectangle is defined.
 Rectangle {
diff --git a/doc/src/snippets/declarative/qml-intro/sequential-animation1.qml b/doc/src/snippets/declarative/qml-intro/sequential-animation1.qml
index a1a1af9..3ff1905 100644
--- a/doc/src/snippets/declarative/qml-intro/sequential-animation1.qml
+++ b/doc/src/snippets/declarative/qml-intro/sequential-animation1.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: mainRec
diff --git a/doc/src/snippets/declarative/qml-intro/sequential-animation2.qml b/doc/src/snippets/declarative/qml-intro/sequential-animation2.qml
index f83c224..47c8d6a 100644
--- a/doc/src/snippets/declarative/qml-intro/sequential-animation2.qml
+++ b/doc/src/snippets/declarative/qml-intro/sequential-animation2.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: mainRec
diff --git a/doc/src/snippets/declarative/qml-intro/sequential-animation3.qml b/doc/src/snippets/declarative/qml-intro/sequential-animation3.qml
index 32bf59c..530907a 100644
--- a/doc/src/snippets/declarative/qml-intro/sequential-animation3.qml
+++ b/doc/src/snippets/declarative/qml-intro/sequential-animation3.qml
@@ -38,10 +38,10 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: mainRec
diff --git a/doc/src/snippets/declarative/qml-intro/states1.qml b/doc/src/snippets/declarative/qml-intro/states1.qml
index 6e7bab1..e63551a 100644
--- a/doc/src/snippets/declarative/qml-intro/states1.qml
+++ b/doc/src/snippets/declarative/qml-intro/states1.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: mainRectangle
diff --git a/doc/src/snippets/declarative/qml-intro/transformations1.qml b/doc/src/snippets/declarative/qml-intro/transformations1.qml
index 7ca3aee..2fea733 100644
--- a/doc/src/snippets/declarative/qml-intro/transformations1.qml
+++ b/doc/src/snippets/declarative/qml-intro/transformations1.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: myWin
diff --git a/doc/src/snippets/declarative/qtbinding/contextproperties/main.qml b/doc/src/snippets/declarative/qtbinding/contextproperties/main.qml
index 341765a..425346d 100644
--- a/doc/src/snippets/declarative/qtbinding/contextproperties/main.qml
+++ b/doc/src/snippets/declarative/qtbinding/contextproperties/main.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 300
diff --git a/doc/src/snippets/declarative/qtbinding/custompalette/main.qml b/doc/src/snippets/declarative/qtbinding/custompalette/main.qml
index ea8464c..a20d9e0 100644
--- a/doc/src/snippets/declarative/qtbinding/custompalette/main.qml
+++ b/doc/src/snippets/declarative/qtbinding/custompalette/main.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 240
diff --git a/doc/src/snippets/declarative/qtbinding/resources/main.qml b/doc/src/snippets/declarative/qtbinding/resources/main.qml
index b12af9e..644d963 100644
--- a/doc/src/snippets/declarative/qtbinding/resources/main.qml
+++ b/doc/src/snippets/declarative/qtbinding/resources/main.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Image {
     source: "images/background.png"
diff --git a/doc/src/snippets/declarative/qtbinding/stopwatch/main.qml b/doc/src/snippets/declarative/qtbinding/stopwatch/main.qml
index 75c0831..f894f71 100644
--- a/doc/src/snippets/declarative/qtbinding/stopwatch/main.qml
+++ b/doc/src/snippets/declarative/qtbinding/stopwatch/main.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 300
diff --git a/doc/src/snippets/declarative/qtobject.qml b/doc/src/snippets/declarative/qtobject.qml
index 581af16..e6e98c2 100644
--- a/doc/src/snippets/declarative/qtobject.qml
+++ b/doc/src/snippets/declarative/qtobject.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     QtObject { 
diff --git a/doc/src/snippets/declarative/rectangle/rect-border-width.qml b/doc/src/snippets/declarative/rectangle/rect-border-width.qml
index 3cf0831..3b2a4e5 100644
--- a/doc/src/snippets/declarative/rectangle/rect-border-width.qml
+++ b/doc/src/snippets/declarative/rectangle/rect-border-width.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 //![0]
 Rectangle {
diff --git a/doc/src/snippets/declarative/rectangle/rectangle-colors.qml b/doc/src/snippets/declarative/rectangle/rectangle-colors.qml
index 8f306f6..df364bc 100644
--- a/doc/src/snippets/declarative/rectangle/rectangle-colors.qml
+++ b/doc/src/snippets/declarative/rectangle/rectangle-colors.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 100; height: 200
diff --git a/doc/src/snippets/declarative/rectangle/rectangle-gradient.qml b/doc/src/snippets/declarative/rectangle/rectangle-gradient.qml
index aff5849..d727e84 100644
--- a/doc/src/snippets/declarative/rectangle/rectangle-gradient.qml
+++ b/doc/src/snippets/declarative/rectangle/rectangle-gradient.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 100; height: 300
diff --git a/doc/src/snippets/declarative/rectangle/rectangle-smooth.qml b/doc/src/snippets/declarative/rectangle/rectangle-smooth.qml
index e1d6980..4cb1050 100644
--- a/doc/src/snippets/declarative/rectangle/rectangle-smooth.qml
+++ b/doc/src/snippets/declarative/rectangle/rectangle-smooth.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 400; height: 200
diff --git a/doc/src/snippets/declarative/rectangle/rectangle.qml b/doc/src/snippets/declarative/rectangle/rectangle.qml
index a464cb9..7bb7c58 100644
--- a/doc/src/snippets/declarative/rectangle/rectangle.qml
+++ b/doc/src/snippets/declarative/rectangle/rectangle.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 100
diff --git a/doc/src/snippets/declarative/repeaters/repeater-grid-index.qml b/doc/src/snippets/declarative/repeaters/repeater-grid-index.qml
index dbf24ae..4835cfe 100644
--- a/doc/src/snippets/declarative/repeaters/repeater-grid-index.qml
+++ b/doc/src/snippets/declarative/repeaters/repeater-grid-index.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 400; height: 400; color: "black"
diff --git a/doc/src/snippets/declarative/repeaters/repeater.qml b/doc/src/snippets/declarative/repeaters/repeater.qml
index db606d0..f3a5505 100644
--- a/doc/src/snippets/declarative/repeaters/repeater.qml
+++ b/doc/src/snippets/declarative/repeaters/repeater.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [import]
-import Qt 4.7
+import QtQuick 1.0
 //! [import]
 
 Row {
diff --git a/doc/src/snippets/declarative/rotation.qml b/doc/src/snippets/declarative/rotation.qml
index 4db8b4a..7366775 100644
--- a/doc/src/snippets/declarative/rotation.qml
+++ b/doc/src/snippets/declarative/rotation.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //! [0]
-import Qt 4.7
+import QtQuick 1.0
 
 Row {
     x: 10; y: 10
diff --git a/doc/src/snippets/declarative/rotationanimation.qml b/doc/src/snippets/declarative/rotationanimation.qml
index 2309d0a..c907287 100644
--- a/doc/src/snippets/declarative/rotationanimation.qml
+++ b/doc/src/snippets/declarative/rotationanimation.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 300; height: 300
diff --git a/doc/src/snippets/declarative/row.qml b/doc/src/snippets/declarative/row.qml
index efb6190..4e4bdd3 100644
--- a/doc/src/snippets/declarative/row.qml
+++ b/doc/src/snippets/declarative/row.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 320; height: 110
diff --git a/doc/src/snippets/declarative/row/row.qml b/doc/src/snippets/declarative/row/row.qml
index 8096c0f..b19bdc2 100644
--- a/doc/src/snippets/declarative/row/row.qml
+++ b/doc/src/snippets/declarative/row/row.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Row {
     spacing: 2
diff --git a/doc/src/snippets/declarative/sequentialanimation.qml b/doc/src/snippets/declarative/sequentialanimation.qml
index 1a17ae9..c8788ac 100644
--- a/doc/src/snippets/declarative/sequentialanimation.qml
+++ b/doc/src/snippets/declarative/sequentialanimation.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: rect
diff --git a/doc/src/snippets/declarative/smoothedanimation.qml b/doc/src/snippets/declarative/smoothedanimation.qml
index edc33db..06e1555 100644
--- a/doc/src/snippets/declarative/smoothedanimation.qml
+++ b/doc/src/snippets/declarative/smoothedanimation.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 800; height: 600
diff --git a/doc/src/snippets/declarative/springanimation.qml b/doc/src/snippets/declarative/springanimation.qml
index fe5aeb8..2051dbe 100644
--- a/doc/src/snippets/declarative/springanimation.qml
+++ b/doc/src/snippets/declarative/springanimation.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 300; height: 300
diff --git a/doc/src/snippets/declarative/state-when.qml b/doc/src/snippets/declarative/state-when.qml
index 6dbd099..583f3ba 100644
--- a/doc/src/snippets/declarative/state-when.qml
+++ b/doc/src/snippets/declarative/state-when.qml
@@ -37,7 +37,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 //![0]
 Rectangle {
     id: myRect
diff --git a/doc/src/snippets/declarative/state.qml b/doc/src/snippets/declarative/state.qml
index 8597314..07fd21b 100644
--- a/doc/src/snippets/declarative/state.qml
+++ b/doc/src/snippets/declarative/state.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: myRect
diff --git a/doc/src/snippets/declarative/states.qml b/doc/src/snippets/declarative/states.qml
index be483af..ee110aa 100644
--- a/doc/src/snippets/declarative/states.qml
+++ b/doc/src/snippets/declarative/states.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
  
 Rectangle {
     id: myRect
diff --git a/doc/src/snippets/declarative/systempalette.qml b/doc/src/snippets/declarative/systempalette.qml
index 5e540b9..53410a1 100644
--- a/doc/src/snippets/declarative/systempalette.qml
+++ b/doc/src/snippets/declarative/systempalette.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     SystemPalette { id: myPalette; colorGroup: SystemPalette.Active }
diff --git a/doc/src/snippets/declarative/text/onLinkActivated.qml b/doc/src/snippets/declarative/text/onLinkActivated.qml
index 0fb236a..e9fd431 100644
--- a/doc/src/snippets/declarative/text/onLinkActivated.qml
+++ b/doc/src/snippets/declarative/text/onLinkActivated.qml
@@ -37,7 +37,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 700; height: 400
diff --git a/doc/src/snippets/declarative/texteditor.qml b/doc/src/snippets/declarative/texteditor.qml
index 55438f4..5596140 100644
--- a/doc/src/snippets/declarative/texteditor.qml
+++ b/doc/src/snippets/declarative/texteditor.qml
@@ -37,7 +37,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 
 //![0]
 Flickable {
diff --git a/doc/src/snippets/declarative/transition-from-to.qml b/doc/src/snippets/declarative/transition-from-to.qml
index 73bf880..4fe39c5 100644
--- a/doc/src/snippets/declarative/transition-from-to.qml
+++ b/doc/src/snippets/declarative/transition-from-to.qml
@@ -37,7 +37,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 
 //![0]
 Rectangle {
diff --git a/doc/src/snippets/declarative/transition-reversible.qml b/doc/src/snippets/declarative/transition-reversible.qml
index b64cf37..e3fec2f 100644
--- a/doc/src/snippets/declarative/transition-reversible.qml
+++ b/doc/src/snippets/declarative/transition-reversible.qml
@@ -37,7 +37,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 
 //![0]
 Rectangle {
diff --git a/doc/src/snippets/declarative/transition.qml b/doc/src/snippets/declarative/transition.qml
index 6a8a2f5..9154c3c 100644
--- a/doc/src/snippets/declarative/transition.qml
+++ b/doc/src/snippets/declarative/transition.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: rect
diff --git a/doc/src/snippets/declarative/visualdatamodel.qml b/doc/src/snippets/declarative/visualdatamodel.qml
index 67f9b6b..e9ad800 100644
--- a/doc/src/snippets/declarative/visualdatamodel.qml
+++ b/doc/src/snippets/declarative/visualdatamodel.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 200; height: 100
diff --git a/doc/src/snippets/declarative/visualdatamodel_rootindex/view.qml b/doc/src/snippets/declarative/visualdatamodel_rootindex/view.qml
index 10bcfe8..bceaac8 100644
--- a/doc/src/snippets/declarative/visualdatamodel_rootindex/view.qml
+++ b/doc/src/snippets/declarative/visualdatamodel_rootindex/view.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 ListView {
     id: view
diff --git a/doc/src/snippets/declarative/workerscript.qml b/doc/src/snippets/declarative/workerscript.qml
index 434a90e..95e787c 100644
--- a/doc/src/snippets/declarative/workerscript.qml
+++ b/doc/src/snippets/declarative/workerscript.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 300; height: 300
diff --git a/doc/src/snippets/declarative/xmlrole.qml b/doc/src/snippets/declarative/xmlrole.qml
index 9c8af89..efa59eb 100644
--- a/doc/src/snippets/declarative/xmlrole.qml
+++ b/doc/src/snippets/declarative/xmlrole.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 300; height: 200
diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js
index 0bb88a8..47539d2 100755
--- a/doc/src/template/scripts/functions.js
+++ b/doc/src/template/scripts/functions.js
@@ -89,7 +89,7 @@ function processNokiaData(response){
 /* fetch the responce from the server using page as the root element */
 	var propertyTags = response.getElementsByTagName('page');
 	/* reset counters */	
-	var lookupCount = 0;
+	var apiCount = 0;
 	var articleCount = 0;
 	var exampleCount = 0;
 	var full_li_element;
@@ -124,7 +124,7 @@ function processNokiaData(response){
 			/* adding the URL attribute*/
 			full_li_element += propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue;
       		/* adding the link title and closing the link and list elements */
-			full_li_element += '">' + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + '</a></li>';
+			full_li_element += '">' + propertyTags[i].getElementsByTagName('pageWords')[0].firstChild.nodeValue + '</a></li>';
 			/* appending the list element to the #resultlist div*/
 			$('#resultlist').append(full_li_element);
 		}
@@ -139,7 +139,12 @@ function processNokiaData(response){
 	  $('#apicount').html(apiCount);
 	  $('#articlecount').html(articleCount);
 	  $('#examplecount').html(exampleCount);
-  }
+	  
+	}
+	else {
+	  $('#pageType').addClass('red');
+	  }
+  
 
 
   // Filtering results in display
@@ -181,6 +186,7 @@ function CheckEmptyAndLoadList()
 	/* Start Extracting information for feedback and adding this to the feedback form */
 	var pageUrl = window.location.href;
 	var pageVal = $('title').html();
+	$('#pageType').removeClass('red');
 	$('#feedUrl').remove();
 	$('#pageVal').remove();
 	$('.menuAlert').remove();
diff --git a/doc/src/template/style/narrow.css b/doc/src/template/style/narrow.css
index 8e42a0d..c1e3f61 100644
--- a/doc/src/template/style/narrow.css
+++ b/doc/src/template/style/narrow.css
@@ -61,6 +61,7 @@
     {
       background-image: none;
       text-indent: 0;
+        width: 260px;
     }
 
     .narrow .header #nav-topright
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 5833266..c07385c 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -204,6 +204,10 @@
     {
         font-size: 13px;
     }
+	.red
+	{
+		color:red;
+	}
 /* end font style elements */
 
 /* global settings*/
@@ -907,7 +911,6 @@
     .wrap .content table p
     {
         line-height: 20px;
-       /* padding: 0px;*/
     }	
     .wrap .content ul
     {