Move some non-essential classes to extra.

16 files changed, 16 insertions, 15 deletions

diff --git a/src/declarative/extra/extra.pri b/src/declarative/extra/extra.pri
index 2590fbc..a0bbdf4 100644
--- a/src/declarative/extra/extra.pri
+++ b/src/declarative/extra/extra.pri
@@ -1,14 +1,27 @@
 SOURCES += \
            extra/qnumberformat.cpp \
            extra/qmlnumberformatter.cpp \
+           extra/qmldatetimeformatter.cpp \
            extra/qfxintegermodel.cpp \
-           extra/qmltimer.cpp
+           extra/qmltimer.cpp \
+           extra/qfxanimatedimageitem.cpp \
+           extra/qfxblendedimage.cpp \
+           extra/qfxflowview.cpp \
+           extra/qmlbehaviour.cpp \
+           extra/qbindablemap.cpp
 
 HEADERS += \
            extra/qnumberformat.h \
            extra/qmlnumberformatter.h \
+           extra/qmldatetimeformatter.h \
            extra/qfxintegermodel.h \
-           extra/qmltimer.h
+           extra/qmltimer.h \
+           extra/qfxanimatedimageitem.h \
+           extra/qfxanimatedimageitem_p.h \
+           extra/qfxblendedimage.h \
+           extra/qfxflowview.h \
+           extra/qmlbehaviour.h \
+           extra/qbindablemap.h
 
 contains(QT_CONFIG, xmlpatterns) {
     QT+=xmlpatterns
diff --git a/src/declarative/util/qbindablemap.cpp b/src/declarative/extra/qbindablemap.cpp
index c8c8ced..c8c8ced 100644
--- a/src/declarative/util/qbindablemap.cpp
+++ b/src/declarative/extra/qbindablemap.cpp
diff --git a/src/declarative/util/qbindablemap.h b/src/declarative/extra/qbindablemap.h
index c76928d..c76928d 100644
--- a/src/declarative/util/qbindablemap.h
+++ b/src/declarative/extra/qbindablemap.h
diff --git a/src/declarative/fx/qfxanimatedimageitem.cpp b/src/declarative/extra/qfxanimatedimageitem.cpp
index d22959a..d22959a 100644
--- a/src/declarative/fx/qfxanimatedimageitem.cpp
+++ b/src/declarative/extra/qfxanimatedimageitem.cpp
diff --git a/src/declarative/fx/qfxanimatedimageitem.h b/src/declarative/extra/qfxanimatedimageitem.h
index 5d115d7..5d115d7 100644
--- a/src/declarative/fx/qfxanimatedimageitem.h
+++ b/src/declarative/extra/qfxanimatedimageitem.h
diff --git a/src/declarative/fx/qfxanimatedimageitem_p.h b/src/declarative/extra/qfxanimatedimageitem_p.h
index cb5da63..e7d8fb8 100644
--- a/src/declarative/fx/qfxanimatedimageitem_p.h
+++ b/src/declarative/extra/qfxanimatedimageitem_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "qfximage_p.h"
+#include <private/qfximage_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/fx/qfxblendedimage.cpp b/src/declarative/extra/qfxblendedimage.cpp
index 0c93fef..0c93fef 100644
--- a/src/declarative/fx/qfxblendedimage.cpp
+++ b/src/declarative/extra/qfxblendedimage.cpp
diff --git a/src/declarative/fx/qfxblendedimage.h b/src/declarative/extra/qfxblendedimage.h
index 248cc9d..248cc9d 100644
--- a/src/declarative/fx/qfxblendedimage.h
+++ b/src/declarative/extra/qfxblendedimage.h
diff --git a/src/declarative/fx/qfxflowview.cpp b/src/declarative/extra/qfxflowview.cpp
index 77cd6df..77cd6df 100644
--- a/src/declarative/fx/qfxflowview.cpp
+++ b/src/declarative/extra/qfxflowview.cpp
diff --git a/src/declarative/fx/qfxflowview.h b/src/declarative/extra/qfxflowview.h
index 0e7c2d3..0e7c2d3 100644
--- a/src/declarative/fx/qfxflowview.h
+++ b/src/declarative/extra/qfxflowview.h
diff --git a/src/declarative/util/qmlbehaviour.cpp b/src/declarative/extra/qmlbehaviour.cpp
index 4beca5e..4beca5e 100644
--- a/src/declarative/util/qmlbehaviour.cpp
+++ b/src/declarative/extra/qmlbehaviour.cpp
diff --git a/src/declarative/util/qmlbehaviour.h b/src/declarative/extra/qmlbehaviour.h
index 7cc83b2..7cc83b2 100644
--- a/src/declarative/util/qmlbehaviour.h
+++ b/src/declarative/extra/qmlbehaviour.h
diff --git a/src/declarative/util/qmldatetimeformatter.cpp b/src/declarative/extra/qmldatetimeformatter.cpp
index ad0e473..ad0e473 100644
--- a/src/declarative/util/qmldatetimeformatter.cpp
+++ b/src/declarative/extra/qmldatetimeformatter.cpp
diff --git a/src/declarative/util/qmldatetimeformatter.h b/src/declarative/extra/qmldatetimeformatter.h
index 84b27e3..84b27e3 100644
--- a/src/declarative/util/qmldatetimeformatter.h
+++ b/src/declarative/extra/qmldatetimeformatter.h
diff --git a/src/declarative/fx/fx.pri b/src/declarative/fx/fx.pri
index 1c819e7..69fada0 100644
--- a/src/declarative/fx/fx.pri
+++ b/src/declarative/fx/fx.pri
@@ -1,8 +1,6 @@
 HEADERS += \
            fx/qfxanchors.h \
            fx/qfxanchors_p.h \
-           fx/qfxanimatedimageitem.h \
-           fx/qfxblendedimage.h \
            fx/qfxblurfilter.h \
            fx/qfxcomponentinstance.h \
            fx/qfxcomponentinstance_p.h \
@@ -15,7 +13,6 @@ HEADERS += \
            fx/qfxfocuspanel.h \
            fx/qfxfocusrealm.h \
            fx/qfxgridview.h \
-           fx/qfxflowview.h \
            fx/qfxhighlightfilter.h \
            fx/qfximage.h \
            fx/qfxpainteditem.h \
@@ -53,8 +50,6 @@ HEADERS += \
 
 SOURCES += \
            fx/qfxanchors.cpp \
-           fx/qfxanimatedimageitem.cpp \
-           fx/qfxblendedimage.cpp \
            fx/qfxblurfilter.cpp \
            fx/qfxcomponentinstance.cpp \
            fx/qfxcontentwrapper.cpp \
@@ -64,7 +59,6 @@ SOURCES += \
            fx/qfxfocuspanel.cpp \
            fx/qfxfocusrealm.cpp \
            fx/qfxgridview.cpp \
-           fx/qfxflowview.cpp \
            fx/qfxhighlightfilter.cpp \
            fx/qfximage.cpp \
            fx/qfxpainteditem.cpp \
diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri
index 030a44e..f35812c 100644
--- a/src/declarative/util/util.pri
+++ b/src/declarative/util/util.pri
@@ -6,7 +6,6 @@ SOURCES += \
            util/qmlpackage.cpp \
            util/qmlscript.cpp \
            util/qmlanimation.cpp \
-           util/qmlbehaviour.cpp \
            util/qmlfont.cpp \
            util/qmlfollow.cpp \
            util/qmlstate.cpp\
@@ -14,8 +13,6 @@ SOURCES += \
            util/qmlsetproperties.cpp \
            util/qmlstategroup.cpp \
            util/qmltransition.cpp \
-           util/qbindablemap.cpp \
-           util/qmldatetimeformatter.cpp \
            util/qmllistmodel.cpp\
            util/qmllistaccessor.cpp \
            util/qmlopenmetaobject.cpp \
@@ -31,7 +28,6 @@ HEADERS += \
            util/qmlscript.h \
            util/qmlanimation.h \
            util/qmlanimation_p.h \
-           util/qmlbehaviour.h \
            util/qmlfont.h \
            util/qmlfollow.h \
            util/qmlstate.h\
@@ -40,8 +36,6 @@ HEADERS += \
            util/qmlstate_p.h\
            util/qmlstategroup.h \
            util/qmltransition.h \
-           util/qbindablemap.h \
-           util/qmldatetimeformatter.h \
            util/qmllistmodel.h\
            util/qmllistaccessor.h \
            util/qmlopenmetaobject.h \