Merge remote branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	src/gui/kernel/qapplication.h

1 files changed, 4 insertions, 4 deletions

diff --git a/doc/src/declarative/qdeclarativedebugging.qdoc b/doc/src/declarative/qdeclarativedebugging.qdoc
index da6e407..ea21852 100644
--- a/doc/src/declarative/qdeclarativedebugging.qdoc
+++ b/doc/src/declarative/qdeclarativedebugging.qdoc
@@ -47,7 +47,7 @@ Rectangle {
 
 When a transition doesn't look quite right, it can be helpful to view it in slow
 motion to see what is happening more clearly. This functionality is supported
-in the \l {Qt Declarative UI Runtime}{qmlviewer} tool: to enable this,
+in the \l {QML Viewer} tool: to enable this,
 click on the "Debugging" menu, then "Slow Down Animations".
 
 
@@ -64,7 +64,7 @@ import Qt 4.7
 Rectangle { width: 100; height: 100 }
 \endqml
 
-If you set \c {QML_IMPORT_TRACE=1} before running the \l {Qt Declarative UI Runtime}{qmlviewer}
+If you set \c {QML_IMPORT_TRACE=1} before running the \l {QML Viewer}
 (or your QML C++ application), you will see output similar to this:
 
 \code
@@ -85,11 +85,11 @@ show QML debugging information and options for your application, including
 object inspection, property monitoring and application frame-rate analysis.
 
 Creator can be used to debug both local and remote QML applications. To
-enable remote debugging, start the \l {Qt Declarative UI Runtime}{qml} tool
+enable remote debugging, start the \l {QML Viewer}
 on the remote device with a debugging port defined, like this:
 
 \code
-    QML_DEBUG_SERVER_PORT=3768 qml myqmlfile.qml
+    QML_DEBUG_SERVER_PORT=3768 qmlviewer myqmlfile.qml
 \endcode
 
 In Creator, open the project settings pane and set the server and port