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)
  ...

15 files changed, 17 insertions, 17 deletions

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