79 files changed, 85 insertions, 85 deletions
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro
index 942b74e..41fee96 100644
--- a/src/declarative/declarative.pro
+++ b/src/declarative/declarative.pro
@@ -17,7 +17,7 @@ include(../qbase.pri)
 #modules
 include(3rdparty/3rdparty.pri)
 include(util/util.pri)
-include(fx/fx.pri)
+include(graphicsitems/graphicsitems.pri)
 include(qml/qml.pri)
 include(extra/extra.pri)
 include(widgets/widgets.pri)
diff --git a/src/declarative/fx/fx.pri b/src/declarative/fx/fx.pri
deleted file mode 100644
index 20e1503..0000000
--- a/src/declarative/fx/fx.pri
+++ /dev/null
@@ -1,84 +0,0 @@
-HEADERS += \
-           fx/qmlgraphicsanchors_p.h \
-           fx/qmlgraphicsanchors_p_p.h \
-           fx/qmlgraphicsevents_p_p.h \
-           fx/qmlgraphicsflickable_p.h \
-           fx/qmlgraphicsflickable_p_p.h \
-           fx/qmlgraphicsflipable_p.h \
-           fx/qmlgraphicsgridview_p.h \
-           fx/qmlgraphicsimage_p.h \
-           fx/qmlgraphicsimagebase_p.h \
-           fx/qmlgraphicsborderimage_p.h \
-           fx/qmlgraphicspainteditem_p.h \
-           fx/qmlgraphicspainteditem_p_p.h \
-           fx/qmlgraphicsimage_p_p.h \
-           fx/qmlgraphicsborderimage_p_p.h \
-           fx/qmlgraphicsimagebase_p_p.h \
-           fx/qmlgraphicsitem.h \
-           fx/qmlgraphicsitem_p.h \
-           fx/qmlgraphicsfocuspanel_p.h \
-           fx/qmlgraphicsfocusscope_p.h \
-           fx/qmlgraphicspositioners_p.h \
-           fx/qmlgraphicspositioners_p_p.h \
-           fx/qmlgraphicsloader_p.h \
-           fx/qmlgraphicsloader_p_p.h \
-           fx/qmlgraphicsmouseregion_p.h \
-           fx/qmlgraphicsmouseregion_p_p.h \
-           fx/qmlgraphicspath_p.h \
-           fx/qmlgraphicspath_p_p.h \
-           fx/qmlgraphicspathview_p.h \
-           fx/qmlgraphicspathview_p_p.h \
-           fx/qmlgraphicsrect_p.h \
-           fx/qmlgraphicsrect_p_p.h \
-           fx/qmlgraphicsrepeater_p.h \
-           fx/qmlgraphicsrepeater_p_p.h \
-           fx/qmlgraphicsscalegrid_p_p.h \
-           fx/qmlgraphicstextinput_p.h \
-           fx/qmlgraphicstextinput_p_p.h \
-           fx/qmlgraphicstextedit_p.h \
-           fx/qmlgraphicstextedit_p_p.h \
-           fx/qmlgraphicstext_p.h \
-           fx/qmlgraphicstext_p_p.h \
-           fx/qmlgraphicspixmapcache_p.h \
-           fx/qmlgraphicsvisualitemmodel_p.h \
-           fx/qmlgraphicslistview_p.h \
-           fx/qmlgraphicsgraphicsobjectcontainer_p.h \
-           fx/qmlgraphicslayoutitem_p.h \
-           fx/qmlgraphicseffects.cpp
-
-SOURCES += \
-           fx/qmlgraphicsanchors.cpp \
-           fx/qmlgraphicsevents.cpp \
-           fx/qmlgraphicsflickable.cpp \
-           fx/qmlgraphicsflipable.cpp \
-           fx/qmlgraphicsgridview.cpp \
-           fx/qmlgraphicsimage.cpp \
-           fx/qmlgraphicsborderimage.cpp \
-           fx/qmlgraphicsimagebase.cpp \
-           fx/qmlgraphicspainteditem.cpp \
-           fx/qmlgraphicsitem.cpp \
-           fx/qmlgraphicsfocuspanel.cpp \
-           fx/qmlgraphicsfocusscope.cpp \
-           fx/qmlgraphicspositioners.cpp \
-           fx/qmlgraphicsloader.cpp \
-           fx/qmlgraphicsmouseregion.cpp \
-           fx/qmlgraphicspath.cpp \
-           fx/qmlgraphicspathview.cpp \
-           fx/qmlgraphicsrect.cpp \
-           fx/qmlgraphicsrepeater.cpp \
-           fx/qmlgraphicsscalegrid.cpp \
-           fx/qmlgraphicstextinput.cpp \
-           fx/qmlgraphicstext.cpp \
-           fx/qmlgraphicstextedit.cpp \
-           fx/qmlgraphicspixmapcache.cpp \
-           fx/qmlgraphicsvisualitemmodel.cpp \
-           fx/qmlgraphicslistview.cpp \
-           fx/qmlgraphicsgraphicsobjectcontainer.cpp \
-           fx/qmlgraphicslayoutitem.cpp \
-
-contains(QT_CONFIG, webkit) {
-    QT+=webkit
-    SOURCES += fx/qmlgraphicswebview.cpp
-    HEADERS += fx/qmlgraphicswebview_p.h
-}
-
diff --git a/src/declarative/graphicsitems/graphicsitems.pri b/src/declarative/graphicsitems/graphicsitems.pri
new file mode 100644
index 0000000..8eac580
--- /dev/null
+++ b/src/declarative/graphicsitems/graphicsitems.pri
@@ -0,0 +1,84 @@
+HEADERS += \
+           graphicsitems/qmlgraphicsanchors_p.h \
+           graphicsitems/qmlgraphicsanchors_p_p.h \
+           graphicsitems/qmlgraphicsevents_p_p.h \
+           graphicsitems/qmlgraphicsflickable_p.h \
+           graphicsitems/qmlgraphicsflickable_p_p.h \
+           graphicsitems/qmlgraphicsflipable_p.h \
+           graphicsitems/qmlgraphicsgridview_p.h \
+           graphicsitems/qmlgraphicsimage_p.h \
+           graphicsitems/qmlgraphicsimagebase_p.h \
+           graphicsitems/qmlgraphicsborderimage_p.h \
+           graphicsitems/qmlgraphicspainteditem_p.h \
+           graphicsitems/qmlgraphicspainteditem_p_p.h \
+           graphicsitems/qmlgraphicsimage_p_p.h \
+           graphicsitems/qmlgraphicsborderimage_p_p.h \
+           graphicsitems/qmlgraphicsimagebase_p_p.h \
+           graphicsitems/qmlgraphicsitem.h \
+           graphicsitems/qmlgraphicsitem_p.h \
+           graphicsitems/qmlgraphicsfocuspanel_p.h \
+           graphicsitems/qmlgraphicsfocusscope_p.h \
+           graphicsitems/qmlgraphicspositioners_p.h \
+           graphicsitems/qmlgraphicspositioners_p_p.h \
+           graphicsitems/qmlgraphicsloader_p.h \
+           graphicsitems/qmlgraphicsloader_p_p.h \
+           graphicsitems/qmlgraphicsmouseregion_p.h \
+           graphicsitems/qmlgraphicsmouseregion_p_p.h \
+           graphicsitems/qmlgraphicspath_p.h \
+           graphicsitems/qmlgraphicspath_p_p.h \
+           graphicsitems/qmlgraphicspathview_p.h \
+           graphicsitems/qmlgraphicspathview_p_p.h \
+           graphicsitems/qmlgraphicsrect_p.h \
+           graphicsitems/qmlgraphicsrect_p_p.h \
+           graphicsitems/qmlgraphicsrepeater_p.h \
+           graphicsitems/qmlgraphicsrepeater_p_p.h \
+           graphicsitems/qmlgraphicsscalegrid_p_p.h \
+           graphicsitems/qmlgraphicstextinput_p.h \
+           graphicsitems/qmlgraphicstextinput_p_p.h \
+           graphicsitems/qmlgraphicstextedit_p.h \
+           graphicsitems/qmlgraphicstextedit_p_p.h \
+           graphicsitems/qmlgraphicstext_p.h \
+           graphicsitems/qmlgraphicstext_p_p.h \
+           graphicsitems/qmlgraphicspixmapcache_p.h \
+           graphicsitems/qmlgraphicsvisualitemmodel_p.h \
+           graphicsitems/qmlgraphicslistview_p.h \
+           graphicsitems/qmlgraphicsgraphicsobjectcontainer_p.h \
+           graphicsitems/qmlgraphicslayoutitem_p.h \
+           graphicsitems/qmlgraphicseffects.cpp
+
+SOURCES += \
+           graphicsitems/qmlgraphicsanchors.cpp \
+           graphicsitems/qmlgraphicsevents.cpp \
+           graphicsitems/qmlgraphicsflickable.cpp \
+           graphicsitems/qmlgraphicsflipable.cpp \
+           graphicsitems/qmlgraphicsgridview.cpp \
+           graphicsitems/qmlgraphicsimage.cpp \
+           graphicsitems/qmlgraphicsborderimage.cpp \
+           graphicsitems/qmlgraphicsimagebase.cpp \
+           graphicsitems/qmlgraphicspainteditem.cpp \
+           graphicsitems/qmlgraphicsitem.cpp \
+           graphicsitems/qmlgraphicsfocuspanel.cpp \
+           graphicsitems/qmlgraphicsfocusscope.cpp \
+           graphicsitems/qmlgraphicspositioners.cpp \
+           graphicsitems/qmlgraphicsloader.cpp \
+           graphicsitems/qmlgraphicsmouseregion.cpp \
+           graphicsitems/qmlgraphicspath.cpp \
+           graphicsitems/qmlgraphicspathview.cpp \
+           graphicsitems/qmlgraphicsrect.cpp \
+           graphicsitems/qmlgraphicsrepeater.cpp \
+           graphicsitems/qmlgraphicsscalegrid.cpp \
+           graphicsitems/qmlgraphicstextinput.cpp \
+           graphicsitems/qmlgraphicstext.cpp \
+           graphicsitems/qmlgraphicstextedit.cpp \
+           graphicsitems/qmlgraphicspixmapcache.cpp \
+           graphicsitems/qmlgraphicsvisualitemmodel.cpp \
+           graphicsitems/qmlgraphicslistview.cpp \
+           graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp \
+           graphicsitems/qmlgraphicslayoutitem.cpp \
+
+contains(QT_CONFIG, webkit) {
+    QT+=webkit
+    SOURCES += graphicsitems/qmlgraphicswebview.cpp
+    HEADERS += graphicsitems/qmlgraphicswebview_p.h
+}
+
diff --git a/src/declarative/fx/qmlgraphicsanchors.cpp b/src/declarative/graphicsitems/qmlgraphicsanchors.cpp
index e1d2f43..e1d2f43 100644
--- a/src/declarative/fx/qmlgraphicsanchors.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsanchors.cpp
diff --git a/src/declarative/fx/qmlgraphicsanchors_p.h b/src/declarative/graphicsitems/qmlgraphicsanchors_p.h
index f6e9e1a..f6e9e1a 100644
--- a/src/declarative/fx/qmlgraphicsanchors_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsanchors_p.h
diff --git a/src/declarative/fx/qmlgraphicsanchors_p_p.h b/src/declarative/graphicsitems/qmlgraphicsanchors_p_p.h
index 5f8b2c1..5f8b2c1 100644
--- a/src/declarative/fx/qmlgraphicsanchors_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsanchors_p_p.h
diff --git a/src/declarative/fx/qmlgraphicsborderimage.cpp b/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp
index ed39a2b..ed39a2b 100644
--- a/src/declarative/fx/qmlgraphicsborderimage.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp
diff --git a/src/declarative/fx/qmlgraphicsborderimage_p.h b/src/declarative/graphicsitems/qmlgraphicsborderimage_p.h
index 04850e6..04850e6 100644
--- a/src/declarative/fx/qmlgraphicsborderimage_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsborderimage_p.h
diff --git a/src/declarative/fx/qmlgraphicsborderimage_p_p.h b/src/declarative/graphicsitems/qmlgraphicsborderimage_p_p.h
index 51ebb02..51ebb02 100644
--- a/src/declarative/fx/qmlgraphicsborderimage_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsborderimage_p_p.h
diff --git a/src/declarative/fx/qmlgraphicseffects.cpp b/src/declarative/graphicsitems/qmlgraphicseffects.cpp
index c611eea..c611eea 100644
--- a/src/declarative/fx/qmlgraphicseffects.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicseffects.cpp
diff --git a/src/declarative/fx/qmlgraphicsevents.cpp b/src/declarative/graphicsitems/qmlgraphicsevents.cpp
index 9958dea..9958dea 100644
--- a/src/declarative/fx/qmlgraphicsevents.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsevents.cpp
diff --git a/src/declarative/fx/qmlgraphicsevents_p_p.h b/src/declarative/graphicsitems/qmlgraphicsevents_p_p.h
index 9cab18e..9cab18e 100644
--- a/src/declarative/fx/qmlgraphicsevents_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsevents_p_p.h
diff --git a/src/declarative/fx/qmlgraphicsflickable.cpp b/src/declarative/graphicsitems/qmlgraphicsflickable.cpp
index 8895977..8895977 100644
--- a/src/declarative/fx/qmlgraphicsflickable.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsflickable.cpp
diff --git a/src/declarative/fx/qmlgraphicsflickable_p.h b/src/declarative/graphicsitems/qmlgraphicsflickable_p.h
index 08b0fd8..08b0fd8 100644
--- a/src/declarative/fx/qmlgraphicsflickable_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsflickable_p.h
diff --git a/src/declarative/fx/qmlgraphicsflickable_p_p.h b/src/declarative/graphicsitems/qmlgraphicsflickable_p_p.h
index 2850e35..2850e35 100644
--- a/src/declarative/fx/qmlgraphicsflickable_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsflickable_p_p.h
diff --git a/src/declarative/fx/qmlgraphicsflipable.cpp b/src/declarative/graphicsitems/qmlgraphicsflipable.cpp
index 05cc214..05cc214 100644
--- a/src/declarative/fx/qmlgraphicsflipable.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsflipable.cpp
diff --git a/src/declarative/fx/qmlgraphicsflipable_p.h b/src/declarative/graphicsitems/qmlgraphicsflipable_p.h
index 23b6c76..23b6c76 100644
--- a/src/declarative/fx/qmlgraphicsflipable_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsflipable_p.h
diff --git a/src/declarative/fx/qmlgraphicsfocuspanel.cpp b/src/declarative/graphicsitems/qmlgraphicsfocuspanel.cpp
index d3ee184..d3ee184 100644
--- a/src/declarative/fx/qmlgraphicsfocuspanel.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsfocuspanel.cpp
diff --git a/src/declarative/fx/qmlgraphicsfocuspanel_p.h b/src/declarative/graphicsitems/qmlgraphicsfocuspanel_p.h
index d014da2..d014da2 100644
--- a/src/declarative/fx/qmlgraphicsfocuspanel_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsfocuspanel_p.h
diff --git a/src/declarative/fx/qmlgraphicsfocusscope.cpp b/src/declarative/graphicsitems/qmlgraphicsfocusscope.cpp
index cd30b2b..cd30b2b 100644
--- a/src/declarative/fx/qmlgraphicsfocusscope.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsfocusscope.cpp
diff --git a/src/declarative/fx/qmlgraphicsfocusscope_p.h b/src/declarative/graphicsitems/qmlgraphicsfocusscope_p.h
index 813a999..813a999 100644
--- a/src/declarative/fx/qmlgraphicsfocusscope_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsfocusscope_p.h
diff --git a/src/declarative/fx/qmlgraphicsgraphicsobjectcontainer.cpp b/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp
index 2a0d6a6..2a0d6a6 100644
--- a/src/declarative/fx/qmlgraphicsgraphicsobjectcontainer.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp
diff --git a/src/declarative/fx/qmlgraphicsgraphicsobjectcontainer_p.h b/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer_p.h
index 10f08bd..10f08bd 100644
--- a/src/declarative/fx/qmlgraphicsgraphicsobjectcontainer_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer_p.h
diff --git a/src/declarative/fx/qmlgraphicsgridview.cpp b/src/declarative/graphicsitems/qmlgraphicsgridview.cpp
index cadd650..cadd650 100644
--- a/src/declarative/fx/qmlgraphicsgridview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsgridview.cpp
diff --git a/src/declarative/fx/qmlgraphicsgridview_p.h b/src/declarative/graphicsitems/qmlgraphicsgridview_p.h
index 3fd36bd..3fd36bd 100644
--- a/src/declarative/fx/qmlgraphicsgridview_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsgridview_p.h
diff --git a/src/declarative/fx/qmlgraphicsimage.cpp b/src/declarative/graphicsitems/qmlgraphicsimage.cpp
index fd220a3..fd220a3 100644
--- a/src/declarative/fx/qmlgraphicsimage.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsimage.cpp
diff --git a/src/declarative/fx/qmlgraphicsimage_p.h b/src/declarative/graphicsitems/qmlgraphicsimage_p.h
index 76b8da5..76b8da5 100644
--- a/src/declarative/fx/qmlgraphicsimage_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsimage_p.h
diff --git a/src/declarative/fx/qmlgraphicsimage_p_p.h b/src/declarative/graphicsitems/qmlgraphicsimage_p_p.h
index 62a4d1e..62a4d1e 100644
--- a/src/declarative/fx/qmlgraphicsimage_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsimage_p_p.h
diff --git a/src/declarative/fx/qmlgraphicsimagebase.cpp b/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp
index 283fb04..283fb04 100644
--- a/src/declarative/fx/qmlgraphicsimagebase.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp
diff --git a/src/declarative/fx/qmlgraphicsimagebase_p.h b/src/declarative/graphicsitems/qmlgraphicsimagebase_p.h
index c8f8e85..c8f8e85 100644
--- a/src/declarative/fx/qmlgraphicsimagebase_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsimagebase_p.h
diff --git a/src/declarative/fx/qmlgraphicsimagebase_p_p.h b/src/declarative/graphicsitems/qmlgraphicsimagebase_p_p.h
index e7f85a6..e7f85a6 100644
--- a/src/declarative/fx/qmlgraphicsimagebase_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsimagebase_p_p.h
diff --git a/src/declarative/fx/qmlgraphicsitem.cpp b/src/declarative/graphicsitems/qmlgraphicsitem.cpp
index 0e741c4..0e741c4 100644
--- a/src/declarative/fx/qmlgraphicsitem.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsitem.cpp
diff --git a/src/declarative/fx/qmlgraphicsitem.h b/src/declarative/graphicsitems/qmlgraphicsitem.h
index bdfc245..bdfc245 100644
--- a/src/declarative/fx/qmlgraphicsitem.h
+++ b/src/declarative/graphicsitems/qmlgraphicsitem.h
diff --git a/src/declarative/fx/qmlgraphicsitem_p.h b/src/declarative/graphicsitems/qmlgraphicsitem_p.h
index f98c121..f98c121 100644
--- a/src/declarative/fx/qmlgraphicsitem_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsitem_p.h
diff --git a/src/declarative/fx/qmlgraphicslayoutitem.cpp b/src/declarative/graphicsitems/qmlgraphicslayoutitem.cpp
index 45420ed..45420ed 100644
--- a/src/declarative/fx/qmlgraphicslayoutitem.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicslayoutitem.cpp
diff --git a/src/declarative/fx/qmlgraphicslayoutitem_p.h b/src/declarative/graphicsitems/qmlgraphicslayoutitem_p.h
index 35905b5..35905b5 100644
--- a/src/declarative/fx/qmlgraphicslayoutitem_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicslayoutitem_p.h
diff --git a/src/declarative/fx/qmlgraphicslistview.cpp b/src/declarative/graphicsitems/qmlgraphicslistview.cpp
index dc8bab2..dc8bab2 100644
--- a/src/declarative/fx/qmlgraphicslistview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicslistview.cpp
diff --git a/src/declarative/fx/qmlgraphicslistview_p.h b/src/declarative/graphicsitems/qmlgraphicslistview_p.h
index 115cad9..115cad9 100644
--- a/src/declarative/fx/qmlgraphicslistview_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicslistview_p.h
diff --git a/src/declarative/fx/qmlgraphicsloader.cpp b/src/declarative/graphicsitems/qmlgraphicsloader.cpp
index 65753d8..65753d8 100644
--- a/src/declarative/fx/qmlgraphicsloader.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsloader.cpp
diff --git a/src/declarative/fx/qmlgraphicsloader_p.h b/src/declarative/graphicsitems/qmlgraphicsloader_p.h
index 8cd1819..8cd1819 100644
--- a/src/declarative/fx/qmlgraphicsloader_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsloader_p.h
diff --git a/src/declarative/fx/qmlgraphicsloader_p_p.h b/src/declarative/graphicsitems/qmlgraphicsloader_p_p.h
index 23fedb7..23fedb7 100644
--- a/src/declarative/fx/qmlgraphicsloader_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsloader_p_p.h
diff --git a/src/declarative/fx/qmlgraphicsmouseregion.cpp b/src/declarative/graphicsitems/qmlgraphicsmouseregion.cpp
index 75e31b8..75e31b8 100644
--- a/src/declarative/fx/qmlgraphicsmouseregion.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsmouseregion.cpp
diff --git a/src/declarative/fx/qmlgraphicsmouseregion_p.h b/src/declarative/graphicsitems/qmlgraphicsmouseregion_p.h
index 3403c75..3403c75 100644
--- a/src/declarative/fx/qmlgraphicsmouseregion_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsmouseregion_p.h
diff --git a/src/declarative/fx/qmlgraphicsmouseregion_p_p.h b/src/declarative/graphicsitems/qmlgraphicsmouseregion_p_p.h
index ad7cc9f..ad7cc9f 100644
--- a/src/declarative/fx/qmlgraphicsmouseregion_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsmouseregion_p_p.h
diff --git a/src/declarative/fx/qmlgraphicspainteditem.cpp b/src/declarative/graphicsitems/qmlgraphicspainteditem.cpp
index a0d9b09..a0d9b09 100644
--- a/src/declarative/fx/qmlgraphicspainteditem.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicspainteditem.cpp
diff --git a/src/declarative/fx/qmlgraphicspainteditem_p.h b/src/declarative/graphicsitems/qmlgraphicspainteditem_p.h
index 99873a7..99873a7 100644
--- a/src/declarative/fx/qmlgraphicspainteditem_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspainteditem_p.h
diff --git a/src/declarative/fx/qmlgraphicspainteditem_p_p.h b/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h
index a744557..a744557 100644
--- a/src/declarative/fx/qmlgraphicspainteditem_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h
diff --git a/src/declarative/fx/qmlgraphicspath.cpp b/src/declarative/graphicsitems/qmlgraphicspath.cpp
index c0e6caf..c0e6caf 100644
--- a/src/declarative/fx/qmlgraphicspath.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicspath.cpp
diff --git a/src/declarative/fx/qmlgraphicspath_p.h b/src/declarative/graphicsitems/qmlgraphicspath_p.h
index 4710367..4710367 100644
--- a/src/declarative/fx/qmlgraphicspath_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspath_p.h
diff --git a/src/declarative/fx/qmlgraphicspath_p_p.h b/src/declarative/graphicsitems/qmlgraphicspath_p_p.h
index 36e8945..36e8945 100644
--- a/src/declarative/fx/qmlgraphicspath_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspath_p_p.h
diff --git a/src/declarative/fx/qmlgraphicspathview.cpp b/src/declarative/graphicsitems/qmlgraphicspathview.cpp
index 52d2fa9..52d2fa9 100644
--- a/src/declarative/fx/qmlgraphicspathview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicspathview.cpp
diff --git a/src/declarative/fx/qmlgraphicspathview_p.h b/src/declarative/graphicsitems/qmlgraphicspathview_p.h
index f1fed98..f1fed98 100644
--- a/src/declarative/fx/qmlgraphicspathview_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspathview_p.h
diff --git a/src/declarative/fx/qmlgraphicspathview_p_p.h b/src/declarative/graphicsitems/qmlgraphicspathview_p_p.h
index a0f2a3d..a0f2a3d 100644
--- a/src/declarative/fx/qmlgraphicspathview_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspathview_p_p.h
diff --git a/src/declarative/fx/qmlgraphicspixmapcache.cpp b/src/declarative/graphicsitems/qmlgraphicspixmapcache.cpp
index fdf489c..fdf489c 100644
--- a/src/declarative/fx/qmlgraphicspixmapcache.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicspixmapcache.cpp
diff --git a/src/declarative/fx/qmlgraphicspixmapcache_p.h b/src/declarative/graphicsitems/qmlgraphicspixmapcache_p.h
index 29de98d..29de98d 100644
--- a/src/declarative/fx/qmlgraphicspixmapcache_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspixmapcache_p.h
diff --git a/src/declarative/fx/qmlgraphicspositioners.cpp b/src/declarative/graphicsitems/qmlgraphicspositioners.cpp
index ba696e7..ba696e7 100644
--- a/src/declarative/fx/qmlgraphicspositioners.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicspositioners.cpp
diff --git a/src/declarative/fx/qmlgraphicspositioners_p.h b/src/declarative/graphicsitems/qmlgraphicspositioners_p.h
index 0011ec5..0011ec5 100644
--- a/src/declarative/fx/qmlgraphicspositioners_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspositioners_p.h
diff --git a/src/declarative/fx/qmlgraphicspositioners_p_p.h b/src/declarative/graphicsitems/qmlgraphicspositioners_p_p.h
index 61b4497..61b4497 100644
--- a/src/declarative/fx/qmlgraphicspositioners_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspositioners_p_p.h
diff --git a/src/declarative/fx/qmlgraphicsrect.cpp b/src/declarative/graphicsitems/qmlgraphicsrect.cpp
index 605e82c..605e82c 100644
--- a/src/declarative/fx/qmlgraphicsrect.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsrect.cpp
diff --git a/src/declarative/fx/qmlgraphicsrect_p.h b/src/declarative/graphicsitems/qmlgraphicsrect_p.h
index 97334fd..97334fd 100644
--- a/src/declarative/fx/qmlgraphicsrect_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsrect_p.h
diff --git a/src/declarative/fx/qmlgraphicsrect_p_p.h b/src/declarative/graphicsitems/qmlgraphicsrect_p_p.h
index f44e8de..f44e8de 100644
--- a/src/declarative/fx/qmlgraphicsrect_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsrect_p_p.h
diff --git a/src/declarative/fx/qmlgraphicsrepeater.cpp b/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp
index ba860e9..ba860e9 100644
--- a/src/declarative/fx/qmlgraphicsrepeater.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp
diff --git a/src/declarative/fx/qmlgraphicsrepeater_p.h b/src/declarative/graphicsitems/qmlgraphicsrepeater_p.h
index 8d71303..8d71303 100644
--- a/src/declarative/fx/qmlgraphicsrepeater_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsrepeater_p.h
diff --git a/src/declarative/fx/qmlgraphicsrepeater_p_p.h b/src/declarative/graphicsitems/qmlgraphicsrepeater_p_p.h
index 4af0d9e..4af0d9e 100644
--- a/src/declarative/fx/qmlgraphicsrepeater_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsrepeater_p_p.h
diff --git a/src/declarative/fx/qmlgraphicsscalegrid.cpp b/src/declarative/graphicsitems/qmlgraphicsscalegrid.cpp
index 7517a3c..7517a3c 100644
--- a/src/declarative/fx/qmlgraphicsscalegrid.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsscalegrid.cpp
diff --git a/src/declarative/fx/qmlgraphicsscalegrid_p_p.h b/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h
index b66a5a5..b66a5a5 100644
--- a/src/declarative/fx/qmlgraphicsscalegrid_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h
diff --git a/src/declarative/fx/qmlgraphicstext.cpp b/src/declarative/graphicsitems/qmlgraphicstext.cpp
index 6790923..6790923 100644
--- a/src/declarative/fx/qmlgraphicstext.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicstext.cpp
diff --git a/src/declarative/fx/qmlgraphicstext_p.h b/src/declarative/graphicsitems/qmlgraphicstext_p.h
index ac1ded0..ac1ded0 100644
--- a/src/declarative/fx/qmlgraphicstext_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicstext_p.h
diff --git a/src/declarative/fx/qmlgraphicstext_p_p.h b/src/declarative/graphicsitems/qmlgraphicstext_p_p.h
index 4ca1ad4..4ca1ad4 100644
--- a/src/declarative/fx/qmlgraphicstext_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicstext_p_p.h
diff --git a/src/declarative/fx/qmlgraphicstextedit.cpp b/src/declarative/graphicsitems/qmlgraphicstextedit.cpp
index 0c81dca..0c81dca 100644
--- a/src/declarative/fx/qmlgraphicstextedit.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicstextedit.cpp
diff --git a/src/declarative/fx/qmlgraphicstextedit_p.h b/src/declarative/graphicsitems/qmlgraphicstextedit_p.h
index efbe998..efbe998 100644
--- a/src/declarative/fx/qmlgraphicstextedit_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicstextedit_p.h
diff --git a/src/declarative/fx/qmlgraphicstextedit_p_p.h b/src/declarative/graphicsitems/qmlgraphicstextedit_p_p.h
index 4cbc56d..4cbc56d 100644
--- a/src/declarative/fx/qmlgraphicstextedit_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicstextedit_p_p.h
diff --git a/src/declarative/fx/qmlgraphicstextinput.cpp b/src/declarative/graphicsitems/qmlgraphicstextinput.cpp
index 44ccda1..44ccda1 100644
--- a/src/declarative/fx/qmlgraphicstextinput.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicstextinput.cpp
diff --git a/src/declarative/fx/qmlgraphicstextinput_p.h b/src/declarative/graphicsitems/qmlgraphicstextinput_p.h
index 7d3fef0..7d3fef0 100644
--- a/src/declarative/fx/qmlgraphicstextinput_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicstextinput_p.h
diff --git a/src/declarative/fx/qmlgraphicstextinput_p_p.h b/src/declarative/graphicsitems/qmlgraphicstextinput_p_p.h
index 4e9f209..4e9f209 100644
--- a/src/declarative/fx/qmlgraphicstextinput_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicstextinput_p_p.h
diff --git a/src/declarative/fx/qmlgraphicsvisualitemmodel.cpp b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
index 686c0da..686c0da 100644
--- a/src/declarative/fx/qmlgraphicsvisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
diff --git a/src/declarative/fx/qmlgraphicsvisualitemmodel_p.h b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel_p.h
index 8b0a8f5..8b0a8f5 100644
--- a/src/declarative/fx/qmlgraphicsvisualitemmodel_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel_p.h
diff --git a/src/declarative/fx/qmlgraphicswebview.cpp b/src/declarative/graphicsitems/qmlgraphicswebview.cpp
index c6ab4c7..c6ab4c7 100644
--- a/src/declarative/fx/qmlgraphicswebview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicswebview.cpp
diff --git a/src/declarative/fx/qmlgraphicswebview_p.h b/src/declarative/graphicsitems/qmlgraphicswebview_p.h
index 6852bb0..6852bb0 100644
--- a/src/declarative/fx/qmlgraphicswebview_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicswebview_p.h