Merge branch 'stable' into dev

Conflicts:
	src/qml/doc/qtqml.qdocconf
	src/quick/doc/qtquick.qdocconf

Change-Id: I087fa14720995a5e53c43567dc4a3c29eb9992a9

diff --cc src/qml/qml/parser/qqmljs.g
Simple merge

diff --cc src/qml/qml/parser/qqmljsast.cpp
Simple merge

diff --cc src/qml/qml/parser/qqmljsast_p.h
Simple merge

diff --cc src/qml/qml/parser/qqmljsastfwd_p.h
Simple merge

diff --cc src/qml/qml/parser/qqmljsastvisitor_p.h
Simple merge

diff --cc src/qml/qml/parser/qqmljsengine_p.cpp
Simple merge

diff --cc src/qml/qml/parser/qqmljsgrammar.cpp
Simple merge

diff --cc src/qml/qml/parser/qqmljsgrammar_p.h
Simple merge

diff --cc src/qml/qml/parser/qqmljskeywords_p.h
Simple merge

diff --cc src/qml/qml/parser/qqmljslexer.cpp
Simple merge

diff --cc src/qml/qml/parser/qqmljslexer_p.h
Simple merge

diff --cc src/qml/qml/parser/qqmljsparser.cpp
Simple merge

diff --cc src/qml/qml/parser/qqmljsparser_p.h
Simple merge

diff --cc src/qml/qml/qqmlmetatype.cpp
Simple merge

diff --cc src/qml/qml/qqmlvme.cpp
Simple merge

diff --cc src/qml/qml/v4/qv4irbuilder.cpp
Simple merge

diff --cc src/qml/qml/v4/qv4irbuilder_p.h
Simple merge

diff --cc src/quick/items/qquickitem.cpp
Simple merge

diff --cc src/quick/items/qquickitem_p.h
Simple merge

diff --cc src/quick/items/qquickwindow.cpp
Simple merge

diff --cc src/quick/scenegraph/qsgdefaultrectanglenode.cpp
Simple merge

diff --cc tests/auto/qml/qjsengine/tst_qjsengine.cpp
Simple merge

diff --cc tests/auto/qml/qmlmin/tst_qmlmin.cpp
Simple merge

diff --cc tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
Simple merge

diff --cc tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
Simple merge

diff --cc tests/auto/quick/qquickfocusscope/tst_qquickfocusscope.cpp
Simple merge

diff --cc tests/auto/quick/qquickitem/tst_qquickitem.cpp
Simple merge

diff --cc tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
Simple merge

diff --cc tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
Simple merge

diff --cc tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
Simple merge

diff --cc tools/qmlmin/main.cpp
Simple merge

diff --cc tools/qmlscene/main.cpp
index 1121f02,a9a907f..090d173
--- 1/tools/qmlscene/main.cpp
--- 2/tools/qmlscene/main.cpp
+++ b/tools/qmlscene/main.cpp
@@@ -347,11 -345,11 +347,11 @@@ static void usage(
  {
      qWarning("Usage: qmlscene [options] <filename>");
      qWarning(" ");
-     qWarning(" options:");
-     qWarning("  --maximized ............................... run maximized");
-     qWarning("  --fullscreen .............................. run fullscreen");
+     qWarning(" Options:");
+     qWarning("  --maximized ............................... Run maximized");
+     qWarning("  --fullscreen .............................. Run fullscreen");
      qWarning("  --transparent ............................. Make the window transparent");
 -    qWarning("  --no-multisample .......................... Disable multisampling (anti-aliasing)");
 +    qWarning("  --multisample ............................. Enable multisampling (OpenGL anti-aliasing)");
      qWarning("  --no-version-detection .................... Do not try to detect the version of the .qml file");
      qWarning("  --slow-animations ......................... Run all animations in slow motion");
      qWarning("  --resize-to-root .......................... Resize the window to the size of the root item");