put all context2d code into context2d directory

Change-Id: I38442c8d2bcb9f2dcaa433b6bcfd7dbc21439f63
Reviewed-on: http://codereview.qt.nokia.com/1907
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>

8 files changed, 14 insertions, 6 deletions

diff --git a/src/declarative/items/context2d/context2d.pri b/src/declarative/items/context2d/context2d.pri
new file mode 100644
index 0000000000..a43ef7806a
--- /dev/null
+++ b/src/declarative/items/context2d/context2d.pri
@@ -0,0 +1,11 @@
+INCLUDEPATH += $$PWD
+
+SOURCES += \
+    $$PWD/qsgcanvasitem.cpp \
+    $$PWD/qsgcontext2d.cpp \
+
+HEADERS += \
+    $$PWD/qsgcanvasitem_p.h \
+    $$PWD/qsgcontext2d_p_p.h \
+    $$PWD/qsgcontext2d_p.h \
+
diff --git a/src/declarative/items/qsgcanvasitem.cpp b/src/declarative/items/context2d/qsgcanvasitem.cpp
index 0bd9a47d8d..0bd9a47d8d 100644
--- a/src/declarative/items/qsgcanvasitem.cpp
+++ b/src/declarative/items/context2d/qsgcanvasitem.cpp
diff --git a/src/declarative/items/qsgcanvasitem_p.h b/src/declarative/items/context2d/qsgcanvasitem_p.h
index 9a6ccc27ed..9a6ccc27ed 100644
--- a/src/declarative/items/qsgcanvasitem_p.h
+++ b/src/declarative/items/context2d/qsgcanvasitem_p.h
diff --git a/src/declarative/items/qsgcontext2d.cpp b/src/declarative/items/context2d/qsgcontext2d.cpp
index 5dd796bc9e..5dd796bc9e 100644
--- a/src/declarative/items/qsgcontext2d.cpp
+++ b/src/declarative/items/context2d/qsgcontext2d.cpp
diff --git a/src/declarative/items/qsgcontext2d_p.h b/src/declarative/items/context2d/qsgcontext2d_p.h
index 335d954fc1..335d954fc1 100644
--- a/src/declarative/items/qsgcontext2d_p.h
+++ b/src/declarative/items/context2d/qsgcontext2d_p.h
diff --git a/src/declarative/items/qsgcontext2d_p_p.h b/src/declarative/items/context2d/qsgcontext2d_p_p.h
index d71a0bccf2..d71a0bccf2 100644
--- a/src/declarative/items/qsgcontext2d_p_p.h
+++ b/src/declarative/items/context2d/qsgcontext2d_p_p.h
diff --git a/src/declarative/items/items.pri b/src/declarative/items/items.pri
index 78199808cc..85492b72fa 100644
--- a/src/declarative/items/items.pri
+++ b/src/declarative/items/items.pri
@@ -58,9 +58,6 @@ HEADERS += \
     $$PWD/qsgstateoperations_p.h \
     $$PWD/qsgimplicitsizeitem_p.h \
     $$PWD/qsgimplicitsizeitem_p_p.h \
-    $$PWD/qsgcanvasitem_p.h \
-    $$PWD/qsgcontext2d_p.h \
-    $$PWD/qsgcontext2d_p_p.h \
     $$PWD/qsgspriteengine_p.h \
     $$PWD/qsgsprite_p.h \
     $$PWD/qsgspriteimage_p.h \
@@ -105,8 +102,6 @@ SOURCES += \
     $$PWD/qsganimation.cpp \
     $$PWD/qsgstateoperations.cpp \
     $$PWD/qsgimplicitsizeitem.cpp \
-    $$PWD/qsgcanvasitem.cpp \
-    $$PWD/qsgcontext2d.cpp \
     $$PWD/qsgspriteengine.cpp \
     $$PWD/qsgsprite.cpp \
     $$PWD/qsgspriteimage.cpp \
@@ -124,3 +119,5 @@ HEADERS += \
     $$PWD/qsgshadereffectmesh_p.h \
     $$PWD/qsgshadereffectnode_p.h \
     $$PWD/qsgshadereffectsource_p.h \
+
+include(context2d/context2d.pri)
diff --git a/src/declarative/items/qsgcanvas.cpp b/src/declarative/items/qsgcanvas.cpp
index d9bf99d196..38b5da6eb9 100644
--- a/src/declarative/items/qsgcanvas.cpp
+++ b/src/declarative/items/qsgcanvas.cpp
@@ -861,7 +861,7 @@ void QSGCanvasPrivate::cleanup(QSGNode *n)
 static QGLFormat tweakFormat(const QGLFormat &format = QGLFormat::defaultFormat())
 {
     QGLFormat f = format;
-    f.setSwapInterval(1);
+    f.setSwapInterval(0);
     return f;
 }