Merge branch 'master' into qtquick2

Conflicts:
	src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp
	src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h
	tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp

Change-Id: Id2267925c4f77b41f63bbbf555b816ca1f55a0ec

diff --cc src/declarative/items/qsgcanvas.cpp
Simple merge

diff --cc src/declarative/items/qsgitem.cpp
Simple merge

diff --cc src/declarative/items/qsgitem_p.h
Simple merge

diff --cc src/declarative/items/qsgitemsmodule.cpp
Simple merge

diff --cc src/declarative/items/qsgmousearea.cpp
Simple merge

diff --cc src/declarative/items/qsgtext.cpp
Simple merge

diff --cc src/declarative/items/qsgtextnode.cpp
Simple merge

diff --cc src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp
index 3c0a618,1e6b691..7279ff0
--- 1/src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp
--- 2/src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp
+++ b/src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp
@@@ -340,15 -336,7 +336,7 @@@ void QSGDefaultRenderer::render(
  
  }
  
- class Foo : public QPair<int, QSGGeometryNode *>
- {
- public:
-     Foo() { }
-     Foo(int i, QSGGeometryNode *n) : QPair<int, QSGGeometryNode *>(i, n) { }
-     bool operator < (const Foo &other) const { return nodeLessThan(second, other.second); }
- };
- 
 -void QMLRenderer::setSortFrontToBackEnabled(bool sort)
 +void QSGDefaultRenderer::setSortFrontToBackEnabled(bool sort)
  {
      printf("setting sorting to... %d\n", sort);
      m_sort_front_to_back = sort;

diff --cc src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h
index c855ed6,dc2d089..f2adb00
--- 1/src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h
--- 2/src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h
+++ b/src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h
@@@ -52,7 -52,32 +52,32 @@@ QT_BEGIN_NAMESPAC
  
  QT_MODULE(Declarative)
  
 -class QMLRenderer : public QSGRenderer
+ class IndexGeometryNodePair : public QPair<int, QSGGeometryNode *>
+ {
+ public:
+     IndexGeometryNodePair(int i, QSGGeometryNode *n);
+     bool operator < (const IndexGeometryNodePair &other) const;
+ };
+ 
+ 
+ // Minimum heap.
+ class IndexGeometryNodePairHeap
+ {
+ public:
+     IndexGeometryNodePairHeap();
+     void insert(const IndexGeometryNodePair &x);
+     const IndexGeometryNodePair &top() const { return v.first(); }
+     IndexGeometryNodePair pop();
+     bool isEmpty() const { return v.isEmpty(); }
+ private:
+     static int parent(int i) { return (i - 1) >> 1; }
+     static int left(int i) { return (i << 1) | 1; }
+     static int right(int i) { return (i + 1) << 1; }
+     QDataBuffer<IndexGeometryNodePair> v;
+ };
+ 
+ 
 +class QSGDefaultRenderer : public QSGRenderer
  {
      Q_OBJECT
  public:

diff --cc src/declarative/scenegraph/coreapi/qsgrenderer.cpp
Simple merge

diff --cc src/declarative/scenegraph/qsgcontext.cpp
Simple merge