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

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (27 commits)
  Revert "QDeclarativeDebugService: Add bc autotest" to get changes through staging.
  Doc clarification.
  Fallback to A8 text rendering on Mac when LCD smoothing is disabled
  Recreate Qt 4.7 branch QtDeclarative def files on top of changes made to Qt 4.7.1
  Autotest that new "import Qt 4.7"s aren't added accidentally
  Document "import QtQuick 1.0" change
  Replace "import Qt 4.7" with "import QtQuick 1.0"
  Add test for Qt 4.7 module
  Replace all occurances of "Qt 4.7" with "QtQuick 1.0"
  Correct property type of PathAttribute::value in the docs.
  Register QtQuick 1.0 module.
  Remove unused AST node destructors.
  Fix crash when trying to append a null transform to QDeclarativeItem.
  Documentation.
  Documentation fix for Flickable (mark content properties as real, not int).
  QDeclarativeDebugClient: Fix gcc warning
  QmlDebugService: Check that there is a receiver before sending messages
  If a type is registered under several names, share the attached property object
  QmlViewer: Fix typo in comment
  QmlViewer: Fix assert on exit (Windows)
  ...

1 files changed, 4 insertions, 4 deletions

diff --git a/doc/src/declarative/modules.qdoc b/doc/src/declarative/modules.qdoc
index 467b7d0..044c1e7 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