Merge branch 'stable' into dev

Conflicts:
	src/qml/debugger/qv8debugservice.cpp
	src/qml/qml/v8/qv8engine.cpp
	tests/auto/quick/qquickitem/qquickitem.pro

Change-Id: Ic4a1dcdd8b8a84155d2f2abefdf1da5c3a56af31

diff --cc src/imports/dialogs/plugin.cpp
Simple merge

diff --cc src/qml/debugger/qv8debugservice.cpp
Simple merge

diff --cc src/qml/jsapi/qjsvalueiterator.h
index e204558,47862b3..9bbcc7b
--- 1/src/qml/jsapi/qjsvalueiterator.h
--- 2/src/qml/qml/v8/qjsvalueiterator.h
+++ b/src/qml/jsapi/qjsvalueiterator.h
@@@ -39,11 -39,11 +39,11 @@@
  **
  ****************************************************************************/
  
- #ifndef QSCRIPTVALUEITERATOR_H
- #define QSCRIPTVALUEITERATOR_H
+ #ifndef QJSVALUEITERATOR_H
+ #define QJSVALUEITERATOR_H
  
 -#include <QtQml/qtqmlglobal.h>
  #include <QtQml/qjsvalue.h>
 +#include <QtQml/qtqmlglobal.h>
  #include <QtCore/qscopedpointer.h>
  
  QT_BEGIN_NAMESPACE

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

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

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

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

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

diff --cc src/quick/scenegraph/qsgshareddistancefieldglyphcache_p.h
Simple merge

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