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

134 files changed, 157 insertions, 142 deletions

diff --git a/examples/declarative/animation/basics/color-animation.qml b/examples/declarative/animation/basics/color-animation.qml
index 182bb54..809f391 100644
--- a/examples/declarative/animation/basics/color-animation.qml
+++ b/examples/declarative/animation/basics/color-animation.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.particles 1.0
 
 Item {
diff --git a/examples/declarative/animation/basics/property-animation.qml b/examples/declarative/animation/basics/property-animation.qml
index 5149f5b..0a5b353 100644
--- a/examples/declarative/animation/basics/property-animation.qml
+++ b/examples/declarative/animation/basics/property-animation.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: window
diff --git a/examples/declarative/animation/behaviors/SideRect.qml b/examples/declarative/animation/behaviors/SideRect.qml
index eba0817..9517421 100644
--- a/examples/declarative/animation/behaviors/SideRect.qml
+++ b/examples/declarative/animation/behaviors/SideRect.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: myRect
diff --git a/examples/declarative/animation/behaviors/behavior-example.qml b/examples/declarative/animation/behaviors/behavior-example.qml
index 268d6e5..3e050ab 100644
--- a/examples/declarative/animation/behaviors/behavior-example.qml
+++ b/examples/declarative/animation/behaviors/behavior-example.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 600; height: 400
diff --git a/examples/declarative/animation/easing/content/QuitButton.qml b/examples/declarative/animation/easing/content/QuitButton.qml
index 9dfe9bd..cbbf916 100644
--- a/examples/declarative/animation/easing/content/QuitButton.qml
+++ b/examples/declarative/animation/easing/content/QuitButton.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 Image {
     source: "quit.png"
     scale: quitMouse.pressed ? 0.8 : 1.0
@@ -49,4 +49,4 @@ Image {
         anchors.margins: -10
         onClicked: Qt.quit()
     }
-}
\ No newline at end of file
+}
diff --git a/examples/declarative/animation/easing/easing.qml b/examples/declarative/animation/easing/easing.qml
index 9349a25..fd974d9 100644
--- a/examples/declarative/animation/easing/easing.qml
+++ b/examples/declarative/animation/easing/easing.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 
 Rectangle {
diff --git a/examples/declarative/animation/states/states.qml b/examples/declarative/animation/states/states.qml
index 4f3e28c..a9046eb 100644
--- a/examples/declarative/animation/states/states.qml
+++ b/examples/declarative/animation/states/states.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: page
diff --git a/examples/declarative/animation/states/transitions.qml b/examples/declarative/animation/states/transitions.qml
index 6efcdba..ea73b82 100644
--- a/examples/declarative/animation/states/transitions.qml
+++ b/examples/declarative/animation/states/transitions.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 /*
     This is exactly the same as states.qml, except that we have appended
diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml b/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml
index 58536bf..eda9a43 100644
--- a/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml
+++ b/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml
@@ -37,7 +37,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 import "ImageProviderCore" // import the plugin that registers the color image provider
 
 //![0]
diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/view.qml b/examples/declarative/cppextensions/networkaccessmanagerfactory/view.qml
index 439740a..07c2f5a 100644
--- a/examples/declarative/cppextensions/networkaccessmanagerfactory/view.qml
+++ b/examples/declarative/cppextensions/networkaccessmanagerfactory/view.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Image {
     width: 100
diff --git a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/Clock.qml b/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/Clock.qml
index c7d2757..f416c8b 100644
--- a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/Clock.qml
+++ b/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/Clock.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: clock
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qml b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qml
index 571e427..5f442af 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qml
+++ b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 LayoutItem {    //Sized by the layout
     id: resizable
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.qml b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.qml
index fd3aa03..5a83937 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.qml
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import GridLayouts 4.7
 
 Item {
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.qml b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.qml
index 24992d5..becbbfa 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.qml
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import LinearLayouts 4.7
 
 Item {
diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.qml b/examples/declarative/cppextensions/qwidgets/qwidgets.qml
index 16e9227..6ad937b 100644
--- a/examples/declarative/cppextensions/qwidgets/qwidgets.qml
+++ b/examples/declarative/cppextensions/qwidgets/qwidgets.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "QWidgets" 1.0
 
 Rectangle {
diff --git a/examples/declarative/cppextensions/referenceexamples/methods/example.qml b/examples/declarative/cppextensions/referenceexamples/methods/example.qml
index ea3fa5f..f3616c7 100644
--- a/examples/declarative/cppextensions/referenceexamples/methods/example.qml
+++ b/examples/declarative/cppextensions/referenceexamples/methods/example.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import People 1.0
 
 // ![0]
diff --git a/examples/declarative/i18n/i18n.qml b/examples/declarative/i18n/i18n.qml
index fcf24c2..8dac88d 100644
--- a/examples/declarative/i18n/i18n.qml
+++ b/examples/declarative/i18n/i18n.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 //
 // The QML runtime automatically loads a translation from the i18n subdirectory of the root
diff --git a/examples/declarative/imageelements/borderimage/borderimage.qml b/examples/declarative/imageelements/borderimage/borderimage.qml
index bbe113c..53e35f9 100644
--- a/examples/declarative/imageelements/borderimage/borderimage.qml
+++ b/examples/declarative/imageelements/borderimage/borderimage.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 
 Rectangle {
diff --git a/examples/declarative/imageelements/borderimage/content/MyBorderImage.qml b/examples/declarative/imageelements/borderimage/content/MyBorderImage.qml
index b8f8a70..96495cb 100644
--- a/examples/declarative/imageelements/borderimage/content/MyBorderImage.qml
+++ b/examples/declarative/imageelements/borderimage/content/MyBorderImage.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: container
diff --git a/examples/declarative/imageelements/borderimage/content/ShadowRectangle.qml b/examples/declarative/imageelements/borderimage/content/ShadowRectangle.qml
index 73eb040..839ecf1 100644
--- a/examples/declarative/imageelements/borderimage/content/ShadowRectangle.qml
+++ b/examples/declarative/imageelements/borderimage/content/ShadowRectangle.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     property alias color : rectangle.color
diff --git a/examples/declarative/imageelements/borderimage/shadows.qml b/examples/declarative/imageelements/borderimage/shadows.qml
index 4cb7c65..d547f63 100644
--- a/examples/declarative/imageelements/borderimage/shadows.qml
+++ b/examples/declarative/imageelements/borderimage/shadows.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 
 Rectangle {
diff --git a/examples/declarative/imageelements/image/ImageCell.qml b/examples/declarative/imageelements/image/ImageCell.qml
index f8973c8..e8a6c55 100644
--- a/examples/declarative/imageelements/image/ImageCell.qml
+++ b/examples/declarative/imageelements/image/ImageCell.qml
@@ -37,7 +37,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     property alias mode: image.fillMode
diff --git a/examples/declarative/imageelements/image/image.qml b/examples/declarative/imageelements/image/image.qml
index 719d544..f00fc18 100644
--- a/examples/declarative/imageelements/image/image.qml
+++ b/examples/declarative/imageelements/image/image.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 490
diff --git a/examples/declarative/keyinteraction/focus/Core/ContextMenu.qml b/examples/declarative/keyinteraction/focus/Core/ContextMenu.qml
index be32386..79273ad 100644
--- a/examples/declarative/keyinteraction/focus/Core/ContextMenu.qml
+++ b/examples/declarative/keyinteraction/focus/Core/ContextMenu.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 FocusScope {
     id: container
diff --git a/examples/declarative/keyinteraction/focus/Core/GridMenu.qml b/examples/declarative/keyinteraction/focus/Core/GridMenu.qml
index 8cdec3e..263adad 100644
--- a/examples/declarative/keyinteraction/focus/Core/GridMenu.qml
+++ b/examples/declarative/keyinteraction/focus/Core/GridMenu.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 FocusScope {
     property alias interactive: gridView.interactive
diff --git a/examples/declarative/keyinteraction/focus/Core/ListMenu.qml b/examples/declarative/keyinteraction/focus/Core/ListMenu.qml
index ca2e206..cefc9a3 100644
--- a/examples/declarative/keyinteraction/focus/Core/ListMenu.qml
+++ b/examples/declarative/keyinteraction/focus/Core/ListMenu.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 FocusScope {
     clip: true
diff --git a/examples/declarative/keyinteraction/focus/Core/ListViewDelegate.qml b/examples/declarative/keyinteraction/focus/Core/ListViewDelegate.qml
index 95164f8..7b63cd8 100644
--- a/examples/declarative/keyinteraction/focus/Core/ListViewDelegate.qml
+++ b/examples/declarative/keyinteraction/focus/Core/ListViewDelegate.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: container
diff --git a/examples/declarative/keyinteraction/focus/focus.qml b/examples/declarative/keyinteraction/focus/focus.qml
index da2c30d..e2115d8 100644
--- a/examples/declarative/keyinteraction/focus/focus.qml
+++ b/examples/declarative/keyinteraction/focus/focus.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "Core"
 
 Rectangle {
diff --git a/examples/declarative/modelviews/abstractitemmodel/view.qml b/examples/declarative/modelviews/abstractitemmodel/view.qml
index 2fb4885..d1ab302 100644
--- a/examples/declarative/modelviews/abstractitemmodel/view.qml
+++ b/examples/declarative/modelviews/abstractitemmodel/view.qml
@@ -37,7 +37,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 
 //![0]
 ListView {
diff --git a/examples/declarative/modelviews/gridview/gridview-example.qml b/examples/declarative/modelviews/gridview/gridview-example.qml
index aea34ff..85fefda 100644
--- a/examples/declarative/modelviews/gridview/gridview-example.qml
+++ b/examples/declarative/modelviews/gridview/gridview-example.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 300; height: 400
diff --git a/examples/declarative/modelviews/listview/content/PetsModel.qml b/examples/declarative/modelviews/listview/content/PetsModel.qml
index beeed1a..5220763 100644
--- a/examples/declarative/modelviews/listview/content/PetsModel.qml
+++ b/examples/declarative/modelviews/listview/content/PetsModel.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 ListModel {
     ListElement {
diff --git a/examples/declarative/modelviews/listview/content/PressAndHoldButton.qml b/examples/declarative/modelviews/listview/content/PressAndHoldButton.qml
index ad6230e..d6808a4 100644
--- a/examples/declarative/modelviews/listview/content/PressAndHoldButton.qml
+++ b/examples/declarative/modelviews/listview/content/PressAndHoldButton.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Image {
     id: container
diff --git a/examples/declarative/modelviews/listview/content/RecipesModel.qml b/examples/declarative/modelviews/listview/content/RecipesModel.qml
index 812cf77..6056b90 100644
--- a/examples/declarative/modelviews/listview/content/RecipesModel.qml
+++ b/examples/declarative/modelviews/listview/content/RecipesModel.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 ListModel {
     ListElement {
diff --git a/examples/declarative/modelviews/listview/content/TextButton.qml b/examples/declarative/modelviews/listview/content/TextButton.qml
index 0270fdc..f26d775 100644
--- a/examples/declarative/modelviews/listview/content/TextButton.qml
+++ b/examples/declarative/modelviews/listview/content/TextButton.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: container
diff --git a/examples/declarative/modelviews/listview/dynamiclist.qml b/examples/declarative/modelviews/listview/dynamiclist.qml
index 27ef6e0..f25f0fa 100644
--- a/examples/declarative/modelviews/listview/dynamiclist.qml
+++ b/examples/declarative/modelviews/listview/dynamiclist.qml
@@ -37,7 +37,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 
 // This example shows how items can be dynamically added to and removed from
diff --git a/examples/declarative/modelviews/listview/expandingdelegates.qml b/examples/declarative/modelviews/listview/expandingdelegates.qml
index 2dec769..bd3d3a9 100644
--- a/examples/declarative/modelviews/listview/expandingdelegates.qml
+++ b/examples/declarative/modelviews/listview/expandingdelegates.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 
 // This example illustrates expanding a list item to show a more detailed view.
diff --git a/examples/declarative/modelviews/listview/highlight.qml b/examples/declarative/modelviews/listview/highlight.qml
index 5646e9f..249c73b 100644
--- a/examples/declarative/modelviews/listview/highlight.qml
+++ b/examples/declarative/modelviews/listview/highlight.qml
@@ -42,7 +42,7 @@
 // that uses a SpringAnimation to provide custom movement when the
 // highlight bar is moved between items.
 
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 
 Rectangle {
diff --git a/examples/declarative/modelviews/listview/highlightranges.qml b/examples/declarative/modelviews/listview/highlightranges.qml
index 711463a..2716ee5 100644
--- a/examples/declarative/modelviews/listview/highlightranges.qml
+++ b/examples/declarative/modelviews/listview/highlightranges.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 
 Rectangle {
diff --git a/examples/declarative/modelviews/listview/sections.qml b/examples/declarative/modelviews/listview/sections.qml
index a9ec538..3248899 100644
--- a/examples/declarative/modelviews/listview/sections.qml
+++ b/examples/declarative/modelviews/listview/sections.qml
@@ -41,7 +41,7 @@
 // This example shows how a ListView can be separated into sections using
 // the ListView.section attached property.
 
-import Qt 4.7
+import QtQuick 1.0
 
 //! [0]
 Rectangle {
diff --git a/examples/declarative/modelviews/objectlistmodel/view.qml b/examples/declarative/modelviews/objectlistmodel/view.qml
index 7e7c68a..fd9d149 100644
--- a/examples/declarative/modelviews/objectlistmodel/view.qml
+++ b/examples/declarative/modelviews/objectlistmodel/view.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 //![0]
 ListView {
diff --git a/examples/declarative/modelviews/package/Delegate.qml b/examples/declarative/modelviews/package/Delegate.qml
index a38727c..57048f4 100644
--- a/examples/declarative/modelviews/package/Delegate.qml
+++ b/examples/declarative/modelviews/package/Delegate.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 //![0]
 Package {
diff --git a/examples/declarative/modelviews/package/view.qml b/examples/declarative/modelviews/package/view.qml
index 38cc047..cbe8f06 100644
--- a/examples/declarative/modelviews/package/view.qml
+++ b/examples/declarative/modelviews/package/view.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "white"
diff --git a/examples/declarative/modelviews/parallax/parallax.qml b/examples/declarative/modelviews/parallax/parallax.qml
index 3d7d091..0d07522 100644
--- a/examples/declarative/modelviews/parallax/parallax.qml
+++ b/examples/declarative/modelviews/parallax/parallax.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "../../toys/clocks/content"  // for loading the Clock element
 import "qml"
 
diff --git a/examples/declarative/modelviews/parallax/qml/ParallaxView.qml b/examples/declarative/modelviews/parallax/qml/ParallaxView.qml
index 724d7e0..96e3db9 100644
--- a/examples/declarative/modelviews/parallax/qml/ParallaxView.qml
+++ b/examples/declarative/modelviews/parallax/qml/ParallaxView.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: root
diff --git a/examples/declarative/modelviews/parallax/qml/Smiley.qml b/examples/declarative/modelviews/parallax/qml/Smiley.qml
index 959c85c..cac0a17 100644
--- a/examples/declarative/modelviews/parallax/qml/Smiley.qml
+++ b/examples/declarative/modelviews/parallax/qml/Smiley.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 // This is taken from the declarative animation/basics/property-animation.qml
 // example
diff --git a/examples/declarative/modelviews/pathview/pathview-example.qml b/examples/declarative/modelviews/pathview/pathview-example.qml
index 8777291..baf7575 100644
--- a/examples/declarative/modelviews/pathview/pathview-example.qml
+++ b/examples/declarative/modelviews/pathview/pathview-example.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 400; height: 240
diff --git a/examples/declarative/modelviews/stringlistmodel/view.qml b/examples/declarative/modelviews/stringlistmodel/view.qml
index 1751a7a..0a90ee6 100644
--- a/examples/declarative/modelviews/stringlistmodel/view.qml
+++ b/examples/declarative/modelviews/stringlistmodel/view.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 //![0]
 
 ListView {
diff --git a/examples/declarative/modelviews/visualitemmodel/visualitemmodel.qml b/examples/declarative/modelviews/visualitemmodel/visualitemmodel.qml
index 344ce62..15f2f11 100644
--- a/examples/declarative/modelviews/visualitemmodel/visualitemmodel.qml
+++ b/examples/declarative/modelviews/visualitemmodel/visualitemmodel.qml
@@ -41,7 +41,7 @@
 // This example demonstrates placing items in a view using
 // a VisualItemModel
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "lightgray"
diff --git a/examples/declarative/modelviews/webview/alerts.qml b/examples/declarative/modelviews/webview/alerts.qml
index 68f7a5c..4aa4a3b 100644
--- a/examples/declarative/modelviews/webview/alerts.qml
+++ b/examples/declarative/modelviews/webview/alerts.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import QtWebKit 1.0
 
 WebView {
diff --git a/examples/declarative/modelviews/webview/autosize.qml b/examples/declarative/modelviews/webview/autosize.qml
index 91550c1..7e10403 100644
--- a/examples/declarative/modelviews/webview/autosize.qml
+++ b/examples/declarative/modelviews/webview/autosize.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import QtWebKit 1.0
 
 // The WebView size is determined by the width, height,
diff --git a/examples/declarative/modelviews/webview/content/Mapping/Map.qml b/examples/declarative/modelviews/webview/content/Mapping/Map.qml
index ab549b5..9a86579 100644
--- a/examples/declarative/modelviews/webview/content/Mapping/Map.qml
+++ b/examples/declarative/modelviews/webview/content/Mapping/Map.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import QtWebKit 1.0
 
 Item {
diff --git a/examples/declarative/modelviews/webview/googlemaps.qml b/examples/declarative/modelviews/webview/googlemaps.qml
index bc9a0e3..aed0ddd 100644
--- a/examples/declarative/modelviews/webview/googlemaps.qml
+++ b/examples/declarative/modelviews/webview/googlemaps.qml
@@ -45,7 +45,7 @@
 // API, but users from QML don't need to understand the implementation in
 // order to create a Map.
 
-import Qt 4.7
+import QtQuick 1.0
 import QtWebKit 1.0
 import "content/Mapping"
 
diff --git a/examples/declarative/modelviews/webview/inlinehtml.qml b/examples/declarative/modelviews/webview/inlinehtml.qml
index afc8418..afc1fa9 100644
--- a/examples/declarative/modelviews/webview/inlinehtml.qml
+++ b/examples/declarative/modelviews/webview/inlinehtml.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import QtWebKit 1.0
 
 // Inline HTML with loose formatting can be
diff --git a/examples/declarative/modelviews/webview/newwindows.qml b/examples/declarative/modelviews/webview/newwindows.qml
index 5762321..52f7a0b 100644
--- a/examples/declarative/modelviews/webview/newwindows.qml
+++ b/examples/declarative/modelviews/webview/newwindows.qml
@@ -43,7 +43,7 @@
 // Note that to open windows from JavaScript, you will need to
 // allow it on WebView with settings.javascriptCanOpenWindows: true
 
-import Qt 4.7
+import QtQuick 1.0
 import QtWebKit 1.0
 
 Grid {
diff --git a/examples/declarative/positioners/Button.qml b/examples/declarative/positioners/Button.qml
index 4709aa6..32e5993 100644
--- a/examples/declarative/positioners/Button.qml
+++ b/examples/declarative/positioners/Button.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: page
diff --git a/examples/declarative/positioners/positioners.qml b/examples/declarative/positioners/positioners.qml
index 26b9ccd..6ae265e 100644
--- a/examples/declarative/positioners/positioners.qml
+++ b/examples/declarative/positioners/positioners.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: page
diff --git a/examples/declarative/screenorientation/Core/Bubble.qml b/examples/declarative/screenorientation/Core/Bubble.qml
index 58bd13c..dea1e19 100644
--- a/examples/declarative/screenorientation/Core/Bubble.qml
+++ b/examples/declarative/screenorientation/Core/Bubble.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     property bool rising: false
@@ -88,4 +88,4 @@ Rectangle {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/examples/declarative/screenorientation/Core/Button.qml b/examples/declarative/screenorientation/Core/Button.qml
index 11117c9..bc73118 100644
--- a/examples/declarative/screenorientation/Core/Button.qml
+++ b/examples/declarative/screenorientation/Core/Button.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 Item {
     id: button
     signal clicked
diff --git a/examples/declarative/screenorientation/screenorientation.qml b/examples/declarative/screenorientation/screenorientation.qml
index 4387266..6c3f929 100644
--- a/examples/declarative/screenorientation/screenorientation.qml
+++ b/examples/declarative/screenorientation/screenorientation.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "Core"
 import "Core/screenorientation.js" as ScreenOrientation
 
diff --git a/examples/declarative/sqllocalstorage/hello.qml b/examples/declarative/sqllocalstorage/hello.qml
index cbfc14a..5f9b9e0 100644
--- a/examples/declarative/sqllocalstorage/hello.qml
+++ b/examples/declarative/sqllocalstorage/hello.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "white"
diff --git a/examples/declarative/text/fonts/availableFonts.qml b/examples/declarative/text/fonts/availableFonts.qml
index 312bc38..4966a41 100644
--- a/examples/declarative/text/fonts/availableFonts.qml
+++ b/examples/declarative/text/fonts/availableFonts.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 480; height: 640; color: "steelblue"
diff --git a/examples/declarative/text/fonts/banner.qml b/examples/declarative/text/fonts/banner.qml
index 41bc997..d722468 100644
--- a/examples/declarative/text/fonts/banner.qml
+++ b/examples/declarative/text/fonts/banner.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: screen
diff --git a/examples/declarative/text/fonts/fonts.qml b/examples/declarative/text/fonts/fonts.qml
index 743ee79..ae48f24 100644
--- a/examples/declarative/text/fonts/fonts.qml
+++ b/examples/declarative/text/fonts/fonts.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     property string myText: "The quick brown fox jumps over the lazy dog."
diff --git a/examples/declarative/text/fonts/hello.qml b/examples/declarative/text/fonts/hello.qml
index 60bd919..3aaf0fe 100644
--- a/examples/declarative/text/fonts/hello.qml
+++ b/examples/declarative/text/fonts/hello.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: screen
diff --git a/examples/declarative/text/textselection/textselection.qml b/examples/declarative/text/textselection/textselection.qml
index aa958e6..f343be5 100644
--- a/examples/declarative/text/textselection/textselection.qml
+++ b/examples/declarative/text/textselection/textselection.qml
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: editor
diff --git a/examples/declarative/threading/threadedlistmodel/timedisplay.qml b/examples/declarative/threading/threadedlistmodel/timedisplay.qml
index b1cce05..01411f4 100644
--- a/examples/declarative/threading/threadedlistmodel/timedisplay.qml
+++ b/examples/declarative/threading/threadedlistmodel/timedisplay.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 // ![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "white"
diff --git a/examples/declarative/threading/workerscript/workerscript.qml b/examples/declarative/threading/workerscript/workerscript.qml
index e224bf1..2b03233 100644
--- a/examples/declarative/threading/workerscript/workerscript.qml
+++ b/examples/declarative/threading/workerscript/workerscript.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 480; height: 320
diff --git a/examples/declarative/touchinteraction/gestures/experimental-gestures.qml b/examples/declarative/touchinteraction/gestures/experimental-gestures.qml
index 500a909..6a4cb3d 100644
--- a/examples/declarative/touchinteraction/gestures/experimental-gestures.qml
+++ b/examples/declarative/touchinteraction/gestures/experimental-gestures.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.gestures 1.0
 
 // Only works on platforms with Touch support.
diff --git a/examples/declarative/touchinteraction/mousearea/mousearea-example.qml b/examples/declarative/touchinteraction/mousearea/mousearea-example.qml
index 492ffc6..8dacc05 100644
--- a/examples/declarative/touchinteraction/mousearea/mousearea-example.qml
+++ b/examples/declarative/touchinteraction/mousearea/mousearea-example.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: box
diff --git a/examples/declarative/toys/clocks/clocks.qml b/examples/declarative/toys/clocks/clocks.qml
index 9002fac..3354f11 100644
--- a/examples/declarative/toys/clocks/clocks.qml
+++ b/examples/declarative/toys/clocks/clocks.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 
 Rectangle {
diff --git a/examples/declarative/toys/clocks/content/Clock.qml b/examples/declarative/toys/clocks/content/Clock.qml
index 9c732f9..09e8393 100644
--- a/examples/declarative/toys/clocks/content/Clock.qml
+++ b/examples/declarative/toys/clocks/content/Clock.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: clock
diff --git a/examples/declarative/toys/clocks/content/QuitButton.qml b/examples/declarative/toys/clocks/content/QuitButton.qml
index 9dfe9bd..cbbf916 100644
--- a/examples/declarative/toys/clocks/content/QuitButton.qml
+++ b/examples/declarative/toys/clocks/content/QuitButton.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 Image {
     source: "quit.png"
     scale: quitMouse.pressed ? 0.8 : 1.0
@@ -49,4 +49,4 @@ Image {
         anchors.margins: -10
         onClicked: Qt.quit()
     }
-}
\ No newline at end of file
+}
diff --git a/examples/declarative/toys/corkboards/Day.qml b/examples/declarative/toys/corkboards/Day.qml
index 3525a5b..6afa12e 100644
--- a/examples/declarative/toys/corkboards/Day.qml
+++ b/examples/declarative/toys/corkboards/Day.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Component {
     Item {
diff --git a/examples/declarative/toys/corkboards/corkboards.qml b/examples/declarative/toys/corkboards/corkboards.qml
index 9b764c9..14bc5f0 100644
--- a/examples/declarative/toys/corkboards/corkboards.qml
+++ b/examples/declarative/toys/corkboards/corkboards.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 800; height: 480
diff --git a/examples/declarative/toys/dynamicscene/dynamicscene.qml b/examples/declarative/toys/dynamicscene/dynamicscene.qml
index ad18698..5f14e1d 100644
--- a/examples/declarative/toys/dynamicscene/dynamicscene.qml
+++ b/examples/declarative/toys/dynamicscene/dynamicscene.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.particles 1.0
 import "qml"
 
@@ -188,7 +188,7 @@ Item {
                     font.pixelSize: 14
                     wrapMode: TextEdit.WordWrap
 
-                    text: "import Qt 4.7\nImage {\n    id: smile\n    x: 360 * Math.random()\n    y: 180 * Math.random() \n    source: 'images/face-smile.png'\n    NumberAnimation on opacity { \n        to: 0; duration: 1500\n    }\n    Component.onCompleted: smile.destroy(1500);\n}"
+                    text: "import QtQuick 1.0\nImage {\n    id: smile\n    x: 360 * Math.random()\n    y: 180 * Math.random() \n    source: 'images/face-smile.png'\n    NumberAnimation on opacity { \n        to: 0; duration: 1500\n    }\n    Component.onCompleted: smile.destroy(1500);\n}"
                 }
             }
 
diff --git a/examples/declarative/toys/dynamicscene/qml/Button.qml b/examples/declarative/toys/dynamicscene/qml/Button.qml
index 7bb0ddf..8da799e 100644
--- a/examples/declarative/toys/dynamicscene/qml/Button.qml
+++ b/examples/declarative/toys/dynamicscene/qml/Button.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: container
diff --git a/examples/declarative/toys/dynamicscene/qml/GenericSceneItem.qml b/examples/declarative/toys/dynamicscene/qml/GenericSceneItem.qml
index fa976c1..7391412 100644
--- a/examples/declarative/toys/dynamicscene/qml/GenericSceneItem.qml
+++ b/examples/declarative/toys/dynamicscene/qml/GenericSceneItem.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Image {
     property bool created: false
diff --git a/examples/declarative/toys/dynamicscene/qml/PaletteItem.qml b/examples/declarative/toys/dynamicscene/qml/PaletteItem.qml
index 1c31f71..cf5395f 100644
--- a/examples/declarative/toys/dynamicscene/qml/PaletteItem.qml
+++ b/examples/declarative/toys/dynamicscene/qml/PaletteItem.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "itemCreation.js" as Code
 
 Image {
diff --git a/examples/declarative/toys/dynamicscene/qml/PerspectiveItem.qml b/examples/declarative/toys/dynamicscene/qml/PerspectiveItem.qml
index 9b6f243..6536df3 100644
--- a/examples/declarative/toys/dynamicscene/qml/PerspectiveItem.qml
+++ b/examples/declarative/toys/dynamicscene/qml/PerspectiveItem.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Image {
     id: rootItem
diff --git a/examples/declarative/toys/dynamicscene/qml/Sun.qml b/examples/declarative/toys/dynamicscene/qml/Sun.qml
index eb24285..5b28b39 100644
--- a/examples/declarative/toys/dynamicscene/qml/Sun.qml
+++ b/examples/declarative/toys/dynamicscene/qml/Sun.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Image {
     id: sun
diff --git a/examples/declarative/toys/tic-tac-toe/content/Button.qml b/examples/declarative/toys/tic-tac-toe/content/Button.qml
index 2d30a03..403d587 100644
--- a/examples/declarative/toys/tic-tac-toe/content/Button.qml
+++ b/examples/declarative/toys/tic-tac-toe/content/Button.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: container
diff --git a/examples/declarative/toys/tic-tac-toe/content/TicTac.qml b/examples/declarative/toys/tic-tac-toe/content/TicTac.qml
index 0ca5350..7e50736 100644
--- a/examples/declarative/toys/tic-tac-toe/content/TicTac.qml
+++ b/examples/declarative/toys/tic-tac-toe/content/TicTac.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     signal clicked
diff --git a/examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml b/examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml
index 12b0fda..4c1ad51 100644
--- a/examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml
+++ b/examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 import "content/tic-tac-toe.js" as Logic
 
diff --git a/examples/declarative/toys/tvtennis/tvtennis.qml b/examples/declarative/toys/tvtennis/tvtennis.qml
index 53c95c0..805666d 100644
--- a/examples/declarative/toys/tvtennis/tvtennis.qml
+++ b/examples/declarative/toys/tvtennis/tvtennis.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: page
diff --git a/examples/declarative/tutorials/extending/chapter1-basics/app.qml b/examples/declarative/tutorials/extending/chapter1-basics/app.qml
index 826bea9..85bd779 100644
--- a/examples/declarative/tutorials/extending/chapter1-basics/app.qml
+++ b/examples/declarative/tutorials/extending/chapter1-basics/app.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 //![0]
 import Charts 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 300; height: 200
diff --git a/examples/declarative/tutorials/extending/chapter2-methods/app.qml b/examples/declarative/tutorials/extending/chapter2-methods/app.qml
index 50051b6..185b830 100644
--- a/examples/declarative/tutorials/extending/chapter2-methods/app.qml
+++ b/examples/declarative/tutorials/extending/chapter2-methods/app.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 //![0]
 import Charts 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 300; height: 200
diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/app.qml b/examples/declarative/tutorials/extending/chapter3-bindings/app.qml
index e183b27..a4822d3 100644
--- a/examples/declarative/tutorials/extending/chapter3-bindings/app.qml
+++ b/examples/declarative/tutorials/extending/chapter3-bindings/app.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 //![0]
 import Charts 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 300; height: 200
diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/app.qml b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/app.qml
index 6e5d3b4..80af476 100644
--- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/app.qml
+++ b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/app.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 //![0]
 import Charts 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 300; height: 200
diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/app.qml b/examples/declarative/tutorials/extending/chapter5-listproperties/app.qml
index 483332c..58b099f 100644
--- a/examples/declarative/tutorials/extending/chapter5-listproperties/app.qml
+++ b/examples/declarative/tutorials/extending/chapter5-listproperties/app.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 //![0]
 import Charts 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 300; height: 200
diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/app.qml b/examples/declarative/tutorials/extending/chapter6-plugins/app.qml
index 097da7e..639da94 100644
--- a/examples/declarative/tutorials/extending/chapter6-plugins/app.qml
+++ b/examples/declarative/tutorials/extending/chapter6-plugins/app.qml
@@ -37,7 +37,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 300; height: 200
diff --git a/examples/declarative/tutorials/helloworld/Cell.qml b/examples/declarative/tutorials/helloworld/Cell.qml
index e64aa7e..76055ab 100644
--- a/examples/declarative/tutorials/helloworld/Cell.qml
+++ b/examples/declarative/tutorials/helloworld/Cell.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 //![1]
 Item {
diff --git a/examples/declarative/tutorials/helloworld/tutorial1.qml b/examples/declarative/tutorials/helloworld/tutorial1.qml
index e6c4122..83b57b8 100644
--- a/examples/declarative/tutorials/helloworld/tutorial1.qml
+++ b/examples/declarative/tutorials/helloworld/tutorial1.qml
@@ -40,7 +40,7 @@
 
 //![0]
 //![3]
-import Qt 4.7
+import QtQuick 1.0
 //![3]
 
 //![1]
diff --git a/examples/declarative/tutorials/helloworld/tutorial2.qml b/examples/declarative/tutorials/helloworld/tutorial2.qml
index 1ffde57..1bfab92 100644
--- a/examples/declarative/tutorials/helloworld/tutorial2.qml
+++ b/examples/declarative/tutorials/helloworld/tutorial2.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: page
diff --git a/examples/declarative/tutorials/helloworld/tutorial3.qml b/examples/declarative/tutorials/helloworld/tutorial3.qml
index af2d5d2..cc06865 100644
--- a/examples/declarative/tutorials/helloworld/tutorial3.qml
+++ b/examples/declarative/tutorials/helloworld/tutorial3.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: page
diff --git a/examples/declarative/tutorials/samegame/samegame1/Block.qml b/examples/declarative/tutorials/samegame/samegame1/Block.qml
index db1245d..b4c4399 100644
--- a/examples/declarative/tutorials/samegame/samegame1/Block.qml
+++ b/examples/declarative/tutorials/samegame/samegame1/Block.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: block
diff --git a/examples/declarative/tutorials/samegame/samegame1/Button.qml b/examples/declarative/tutorials/samegame/samegame1/Button.qml
index 72b18bc..a3df028 100644
--- a/examples/declarative/tutorials/samegame/samegame1/Button.qml
+++ b/examples/declarative/tutorials/samegame/samegame1/Button.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: container
diff --git a/examples/declarative/tutorials/samegame/samegame1/samegame.qml b/examples/declarative/tutorials/samegame/samegame1/samegame.qml
index 01396fa..5cc13fd 100644
--- a/examples/declarative/tutorials/samegame/samegame1/samegame.qml
+++ b/examples/declarative/tutorials/samegame/samegame1/samegame.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: screen
diff --git a/examples/declarative/tutorials/samegame/samegame2/Block.qml b/examples/declarative/tutorials/samegame/samegame2/Block.qml
index c271cf7..804c30f 100644
--- a/examples/declarative/tutorials/samegame/samegame2/Block.qml
+++ b/examples/declarative/tutorials/samegame/samegame2/Block.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: block
diff --git a/examples/declarative/tutorials/samegame/samegame2/Button.qml b/examples/declarative/tutorials/samegame/samegame2/Button.qml
index 3bd3099..cbf1b54 100644
--- a/examples/declarative/tutorials/samegame/samegame2/Button.qml
+++ b/examples/declarative/tutorials/samegame/samegame2/Button.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: container
diff --git a/examples/declarative/tutorials/samegame/samegame2/samegame.qml b/examples/declarative/tutorials/samegame/samegame2/samegame.qml
index ae1916e..11f6229 100644
--- a/examples/declarative/tutorials/samegame/samegame2/samegame.qml
+++ b/examples/declarative/tutorials/samegame/samegame2/samegame.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 //![2]
 import "samegame.js" as SameGame
 //![2]
diff --git a/examples/declarative/tutorials/samegame/samegame3/Block.qml b/examples/declarative/tutorials/samegame/samegame3/Block.qml
index 673007e..784a6f4 100644
--- a/examples/declarative/tutorials/samegame/samegame3/Block.qml
+++ b/examples/declarative/tutorials/samegame/samegame3/Block.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: block
diff --git a/examples/declarative/tutorials/samegame/samegame3/Button.qml b/examples/declarative/tutorials/samegame/samegame3/Button.qml
index 3bd3099..cbf1b54 100644
--- a/examples/declarative/tutorials/samegame/samegame3/Button.qml
+++ b/examples/declarative/tutorials/samegame/samegame3/Button.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: container
diff --git a/examples/declarative/tutorials/samegame/samegame3/Dialog.qml b/examples/declarative/tutorials/samegame/samegame3/Dialog.qml
index ed17e5f..8554d86 100644
--- a/examples/declarative/tutorials/samegame/samegame3/Dialog.qml
+++ b/examples/declarative/tutorials/samegame/samegame3/Dialog.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: container
diff --git a/examples/declarative/tutorials/samegame/samegame3/samegame.qml b/examples/declarative/tutorials/samegame/samegame3/samegame.qml
index 2c49adc..972b778 100644
--- a/examples/declarative/tutorials/samegame/samegame3/samegame.qml
+++ b/examples/declarative/tutorials/samegame/samegame3/samegame.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 import "samegame.js" as SameGame
 
 Rectangle {
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/BoomBlock.qml b/examples/declarative/tutorials/samegame/samegame4/content/BoomBlock.qml
index 8e3ca96..326b1b8 100644
--- a/examples/declarative/tutorials/samegame/samegame4/content/BoomBlock.qml
+++ b/examples/declarative/tutorials/samegame/samegame4/content/BoomBlock.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.particles 1.0
 
 Item {
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/Button.qml b/examples/declarative/tutorials/samegame/samegame4/content/Button.qml
index 3bd3099..cbf1b54 100644
--- a/examples/declarative/tutorials/samegame/samegame4/content/Button.qml
+++ b/examples/declarative/tutorials/samegame/samegame4/content/Button.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: container
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/Dialog.qml b/examples/declarative/tutorials/samegame/samegame4/content/Dialog.qml
index 5c81929..c390202 100644
--- a/examples/declarative/tutorials/samegame/samegame4/content/Dialog.qml
+++ b/examples/declarative/tutorials/samegame/samegame4/content/Dialog.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 //![0]
 Rectangle {
diff --git a/examples/declarative/tutorials/samegame/samegame4/samegame.qml b/examples/declarative/tutorials/samegame/samegame4/samegame.qml
index 4fec71b..e830635 100644
--- a/examples/declarative/tutorials/samegame/samegame4/samegame.qml
+++ b/examples/declarative/tutorials/samegame/samegame4/samegame.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 import "content/samegame.js" as SameGame
 
diff --git a/examples/declarative/ui-components/dialcontrol/content/Dial.qml b/examples/declarative/ui-components/dialcontrol/content/Dial.qml
index ed1b04d..2f1d27a 100644
--- a/examples/declarative/ui-components/dialcontrol/content/Dial.qml
+++ b/examples/declarative/ui-components/dialcontrol/content/Dial.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: root
diff --git a/examples/declarative/ui-components/dialcontrol/content/QuitButton.qml b/examples/declarative/ui-components/dialcontrol/content/QuitButton.qml
index 9dfe9bd..cbbf916 100644
--- a/examples/declarative/ui-components/dialcontrol/content/QuitButton.qml
+++ b/examples/declarative/ui-components/dialcontrol/content/QuitButton.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 Image {
     source: "quit.png"
     scale: quitMouse.pressed ? 0.8 : 1.0
@@ -49,4 +49,4 @@ Image {
         anchors.margins: -10
         onClicked: Qt.quit()
     }
-}
\ No newline at end of file
+}
diff --git a/examples/declarative/ui-components/dialcontrol/dialcontrol.qml b/examples/declarative/ui-components/dialcontrol/dialcontrol.qml
index ed8c7d6..c66dcdd 100644
--- a/examples/declarative/ui-components/dialcontrol/dialcontrol.qml
+++ b/examples/declarative/ui-components/dialcontrol/dialcontrol.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [imports]
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 //! [imports]
 
diff --git a/examples/declarative/ui-components/flipable/content/Card.qml b/examples/declarative/ui-components/flipable/content/Card.qml
index d22fa7d..32c4ed1 100644
--- a/examples/declarative/ui-components/flipable/content/Card.qml
+++ b/examples/declarative/ui-components/flipable/content/Card.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Flipable {
     id: container
diff --git a/examples/declarative/ui-components/flipable/flipable.qml b/examples/declarative/ui-components/flipable/flipable.qml
index 0f775e5..51867f9 100644
--- a/examples/declarative/ui-components/flipable/flipable.qml
+++ b/examples/declarative/ui-components/flipable/flipable.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 
 Rectangle {
diff --git a/examples/declarative/ui-components/progressbar/content/ProgressBar.qml b/examples/declarative/ui-components/progressbar/content/ProgressBar.qml
index f830f95..e92342a 100644
--- a/examples/declarative/ui-components/progressbar/content/ProgressBar.qml
+++ b/examples/declarative/ui-components/progressbar/content/ProgressBar.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: progressbar
diff --git a/examples/declarative/ui-components/progressbar/main.qml b/examples/declarative/ui-components/progressbar/main.qml
index c92e586..a805a7e 100644
--- a/examples/declarative/ui-components/progressbar/main.qml
+++ b/examples/declarative/ui-components/progressbar/main.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 
 Rectangle {
diff --git a/examples/declarative/ui-components/scrollbar/ScrollBar.qml b/examples/declarative/ui-components/scrollbar/ScrollBar.qml
index ee8e9fa..faa501a 100644
--- a/examples/declarative/ui-components/scrollbar/ScrollBar.qml
+++ b/examples/declarative/ui-components/scrollbar/ScrollBar.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: scrollBar
diff --git a/examples/declarative/ui-components/scrollbar/main.qml b/examples/declarative/ui-components/scrollbar/main.qml
index 930c3b8..b5c1a8f 100644
--- a/examples/declarative/ui-components/scrollbar/main.qml
+++ b/examples/declarative/ui-components/scrollbar/main.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 640
diff --git a/examples/declarative/ui-components/searchbox/SearchBox.qml b/examples/declarative/ui-components/searchbox/SearchBox.qml
index d000750..f54954a 100644
--- a/examples/declarative/ui-components/searchbox/SearchBox.qml
+++ b/examples/declarative/ui-components/searchbox/SearchBox.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 FocusScope {
     id: focusScope
diff --git a/examples/declarative/ui-components/searchbox/main.qml b/examples/declarative/ui-components/searchbox/main.qml
index 513c298..09b1829 100644
--- a/examples/declarative/ui-components/searchbox/main.qml
+++ b/examples/declarative/ui-components/searchbox/main.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: page
diff --git a/examples/declarative/ui-components/slideswitch/content/Switch.qml b/examples/declarative/ui-components/slideswitch/content/Switch.qml
index 9632fd6..06d7a2b 100644
--- a/examples/declarative/ui-components/slideswitch/content/Switch.qml
+++ b/examples/declarative/ui-components/slideswitch/content/Switch.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: toggleswitch
diff --git a/examples/declarative/ui-components/slideswitch/slideswitch.qml b/examples/declarative/ui-components/slideswitch/slideswitch.qml
index a0a0eb2..0472f9f 100644
--- a/examples/declarative/ui-components/slideswitch/slideswitch.qml
+++ b/examples/declarative/ui-components/slideswitch/slideswitch.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 
 Rectangle {
diff --git a/examples/declarative/ui-components/spinner/content/Spinner.qml b/examples/declarative/ui-components/spinner/content/Spinner.qml
index 910efb9..853c787 100644
--- a/examples/declarative/ui-components/spinner/content/Spinner.qml
+++ b/examples/declarative/ui-components/spinner/content/Spinner.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Image {
     property alias model: view.model
diff --git a/examples/declarative/ui-components/spinner/main.qml b/examples/declarative/ui-components/spinner/main.qml
index a196e72..416950f 100644
--- a/examples/declarative/ui-components/spinner/main.qml
+++ b/examples/declarative/ui-components/spinner/main.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 
 Rectangle {
diff --git a/examples/declarative/ui-components/tabwidget/TabWidget.qml b/examples/declarative/ui-components/tabwidget/TabWidget.qml
index 30eba68..f066fd2 100644
--- a/examples/declarative/ui-components/tabwidget/TabWidget.qml
+++ b/examples/declarative/ui-components/tabwidget/TabWidget.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: tabWidget
diff --git a/examples/declarative/ui-components/tabwidget/main.qml b/examples/declarative/ui-components/tabwidget/main.qml
index b9ca2a1..842ef1a 100644
--- a/examples/declarative/ui-components/tabwidget/main.qml
+++ b/examples/declarative/ui-components/tabwidget/main.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 TabWidget {
     id: tabs
diff --git a/examples/declarative/xml/xmlhttprequest/xmlhttprequest-example.qml b/examples/declarative/xml/xmlhttprequest/xmlhttprequest-example.qml
index f77e1de..78f93b5 100644
--- a/examples/declarative/xml/xmlhttprequest/xmlhttprequest-example.qml
+++ b/examples/declarative/xml/xmlhttprequest/xmlhttprequest-example.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 350; height: 400
diff --git a/examples/network/bearermonitor/bearermonitor.cpp b/examples/network/bearermonitor/bearermonitor.cpp
index 1959919..2c976ff 100644
--- a/examples/network/bearermonitor/bearermonitor.cpp
+++ b/examples/network/bearermonitor/bearermonitor.cpp
@@ -220,11 +220,26 @@ void BearerMonitor::updateConfigurations()
         itemMap.insert(item->data(0, Qt::UserRole).toString(), item);
     }
 
+    QNetworkConfiguration defaultConfiguration = manager.defaultConfiguration();
+    QTreeWidgetItem *defaultItem = itemMap.take(defaultConfiguration.identifier());
+
+    if (defaultItem) {
+        updateItem(defaultItem, defaultConfiguration);
+
+        if (defaultConfiguration.type() == QNetworkConfiguration::ServiceNetwork)
+            updateSnapConfiguration(defaultItem, defaultConfiguration);
+    } else {
+        configurationAdded(defaultConfiguration);
+    }
+
     QList<QNetworkConfiguration> allConfigurations = manager.allConfigurations();
 
     while (!allConfigurations.isEmpty()) {
         QNetworkConfiguration config = allConfigurations.takeFirst();
 
+        if (config.identifier() == defaultConfiguration.identifier())
+            continue;
+
         QTreeWidgetItem *item = itemMap.take(config.identifier());
         if (item) {
             updateItem(item, config);
diff --git a/examples/tutorials/gettingStarted/gsQml/core/button.qml b/examples/tutorials/gettingStarted/gsQml/core/button.qml
index dd5dcad..0b42bd1 100644
--- a/examples/tutorials/gettingStarted/gsQml/core/button.qml
+++ b/examples/tutorials/gettingStarted/gsQml/core/button.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     //identifier of the item
@@ -105,4 +105,4 @@ Rectangle {
     //Animate the scale property change
     Behavior on scale { NumberAnimation{ duration: 55 } }
 
-}
\ No newline at end of file
+}
diff --git a/examples/tutorials/gettingStarted/gsQml/core/editMenu.qml b/examples/tutorials/gettingStarted/gsQml/core/editMenu.qml
index 7f47d9f..5cf8472 100644
--- a/examples/tutorials/gettingStarted/gsQml/core/editMenu.qml
+++ b/examples/tutorials/gettingStarted/gsQml/core/editMenu.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: editMenu
@@ -102,4 +102,4 @@ Rectangle {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/examples/tutorials/gettingStarted/gsQml/core/fileDialog.qml b/examples/tutorials/gettingStarted/gsQml/core/fileDialog.qml
index 425f717..7004b63 100644
--- a/examples/tutorials/gettingStarted/gsQml/core/fileDialog.qml
+++ b/examples/tutorials/gettingStarted/gsQml/core/fileDialog.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id:dialog
@@ -160,4 +160,4 @@ Rectangle {
             GradientStop { position: 1.0; color: "#03333333" }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/examples/tutorials/gettingStarted/gsQml/core/fileMenu.qml b/examples/tutorials/gettingStarted/gsQml/core/fileMenu.qml
index afe48c7..517c1811 100644
--- a/examples/tutorials/gettingStarted/gsQml/core/fileMenu.qml
+++ b/examples/tutorials/gettingStarted/gsQml/core/fileMenu.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: fileMenu
diff --git a/examples/tutorials/gettingStarted/gsQml/core/menuBar.qml b/examples/tutorials/gettingStarted/gsQml/core/menuBar.qml
index 0695772..bcab2fb 100644
--- a/examples/tutorials/gettingStarted/gsQml/core/menuBar.qml
+++ b/examples/tutorials/gettingStarted/gsQml/core/menuBar.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: menuBar
diff --git a/examples/tutorials/gettingStarted/gsQml/core/textArea.qml b/examples/tutorials/gettingStarted/gsQml/core/textArea.qml
index 6d3d214..2b327fc 100644
--- a/examples/tutorials/gettingStarted/gsQml/core/textArea.qml
+++ b/examples/tutorials/gettingStarted/gsQml/core/textArea.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id:textArea
@@ -84,4 +84,4 @@ Rectangle {
             selectByMouse: true
         }
     }
-}
\ No newline at end of file
+}
diff --git a/examples/tutorials/gettingStarted/gsQml/texteditor.qml b/examples/tutorials/gettingStarted/gsQml/texteditor.qml
index 5a75e0b..b50dc25 100644
--- a/examples/tutorials/gettingStarted/gsQml/texteditor.qml
+++ b/examples/tutorials/gettingStarted/gsQml/texteditor.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "core"
 
 Rectangle {