Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	tests/auto/qml/debugger/qv8profilerservice/qv8profilerservice.pro

Change-Id: I2fd99ed8bd03302b9bbf31e6f21990f6455c4f1c

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

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

diff --cc src/quick/scenegraph/coreapi/qsggeometry.h
index 679b773,cfed30c..78ad03e
--- 1/src/quick/scenegraph/coreapi/qsggeometry.h
--- 2/src/quick/scenegraph/coreapi/qsggeometry.h
+++ b/src/quick/scenegraph/coreapi/qsggeometry.h
@@@ -44,8 -44,10 +44,8 @@@
  
  #include <QtQuick/qtquickglobal.h>
  #include <QtGui/qopengl.h>
- #include <QRectF>
+ #include <QtCore/QRectF>
  
 -QT_BEGIN_HEADER
 -
  QT_BEGIN_NAMESPACE
  
  class QSGGeometryData;

diff --cc src/quick/scenegraph/coreapi/qsgmaterial.h
index 238bf83,56109d3..38862e6
--- 1/src/quick/scenegraph/coreapi/qsgmaterial.h
--- 2/src/quick/scenegraph/coreapi/qsgmaterial.h
+++ b/src/quick/scenegraph/coreapi/qsgmaterial.h
@@@ -39,12 -39,14 +39,12 @@@
  **
  ****************************************************************************/
  
 -#ifndef MATERIAL_H
 -#define MATERIAL_H
 +#ifndef QSGMATERIAL_H
 +#define QSGMATERIAL_H
  
  #include <QtQuick/qtquickglobal.h>
- #include <qopenglshaderprogram.h>
+ #include <QtGui/qopenglshaderprogram.h>
  
 -QT_BEGIN_HEADER
 -
  QT_BEGIN_NAMESPACE
  
  class QSGMaterial;

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

diff --cc src/quick/scenegraph/util/qsgflatcolormaterial.h
index f0a3a37,b24e5e7..12a37f2
--- 1/src/quick/scenegraph/util/qsgflatcolormaterial.h
--- 2/src/quick/scenegraph/util/qsgflatcolormaterial.h
+++ b/src/quick/scenegraph/util/qsgflatcolormaterial.h
@@@ -39,12 -39,14 +39,12 @@@
  **
  ****************************************************************************/
  
 -#ifndef FLATCOLORMATERIAL_H
 -#define FLATCOLORMATERIAL_H
 +#ifndef QSGFLATCOLORMATERIAL_H
 +#define QSGFLATCOLORMATERIAL_H
  
  #include <QtQuick/qsgmaterial.h>
- #include <qcolor.h>
+ #include <QtGui/qcolor.h>
  
 -QT_BEGIN_HEADER
 -
  QT_BEGIN_NAMESPACE
  
  class Q_QUICK_EXPORT QSGFlatColorMaterial : public QSGMaterial

diff --cc src/quick/scenegraph/util/qsgtexture.h
index ace29cd,4dcea63..299ffc2
--- 1/src/quick/scenegraph/util/qsgtexture.h
--- 2/src/quick/scenegraph/util/qsgtexture.h
+++ b/src/quick/scenegraph/util/qsgtexture.h
@@@ -43,9 -43,11 +43,9 @@@
  #define QSGTEXTURE_H
  
  #include <QtQuick/qtquickglobal.h>
- #include <QObject>
- #include <QImage>
+ #include <QtCore/QObject>
+ #include <QtGui/QImage>
  
 -QT_BEGIN_HEADER
 -
  QT_BEGIN_NAMESPACE
  
  class QSGTexturePrivate;

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

diff --cc tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
Simple merge

diff --cc tests/auto/quick/qquickimage/tst_qquickimage.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