Merge remote-tracking branch 'origin/2.7'

Conflicts:
	doc/src/debugger/qtquick-debugger-example.qdoc

Change-Id: If9a6ac2db76773c50aae26c5156e6aa2603329b3
This commit is contained in:
Eike Ziller
2013-03-18 10:19:14 +01:00
48 changed files with 227 additions and 83 deletions

View File

@@ -168,7 +168,7 @@
\inlineimage qml-observer-bar-reload.png "Apply Changes on Save button"
(\gui {Apply Changes on Save}) button on the toolbar.
When you change property values in the \gui {Console} or in the
When you change property values in the \gui {QML/JS Console} or in the
\gui {Locals and Expressions} view, they are immediately updated in the running
application, but not in the source code.