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

5 files changed, 8 insertions, 4 deletions

diff --git a/tools/qml/browser/Browser.qml b/tools/qml/browser/Browser.qml
index 279c42f..ebed72f 100644
--- a/tools/qml/browser/Browser.qml
+++ b/tools/qml/browser/Browser.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.folderlistmodel 1.0
 
 Rectangle {
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 78cd64d..00d43c1 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -89,6 +89,9 @@ QString warnings;
 void showWarnings()
 {
     if (!warnings.isEmpty()) {
+        int argc = 0; char **argv = 0;
+        QApplication application(argc, argv); // QApplication() in main has been destroyed already.
+        Q_UNUSED(application)
         QMessageBox::warning(0, QApplication::tr("Qt QML Viewer"), warnings);
     }
 }
@@ -516,7 +519,7 @@ int main(int argc, char ** argv)
 
 #if defined (Q_OS_WIN)
     // Debugging output is not visible by default on Windows -
-    // therefore show modal dialog with errors instad.
+    // therefore show modal dialog with errors instead.
     atexit(showWarnings);
 #endif
 
diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp
index c59621a..5e169d8 100644
--- a/tools/qml/qmlruntime.cpp
+++ b/tools/qml/qmlruntime.cpp
@@ -1532,6 +1532,7 @@ void QDeclarativeViewer::registerTypes()
     if (!registered) {
         // registering only for exposing the DeviceOrientation::Orientation enum
         qmlRegisterUncreatableType<DeviceOrientation>("Qt",4,7,"Orientation","");
+        qmlRegisterUncreatableType<DeviceOrientation>("QtQuick",1,0,"Orientation","");
         registered = true;
     }
 }
diff --git a/tools/qml/startup/Logo.qml b/tools/qml/startup/Logo.qml
index 8d9708d..aa5648f 100644
--- a/tools/qml/startup/Logo.qml
+++ b/tools/qml/startup/Logo.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: myApp
diff --git a/tools/qml/startup/startup.qml b/tools/qml/startup/startup.qml
index ddc7217..9ca50a3 100644
--- a/tools/qml/startup/startup.qml
+++ b/tools/qml/startup/startup.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: treatsApp