Get rid of the extra directory.

15 files changed, 18 insertions, 23 deletions

diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro
index 41fee96..e5e604b 100644
--- a/src/declarative/declarative.pro
+++ b/src/declarative/declarative.pro
@@ -19,7 +19,6 @@ include(3rdparty/3rdparty.pri)
 include(util/util.pri)
 include(graphicsitems/graphicsitems.pri)
 include(qml/qml.pri)
-include(extra/extra.pri)
 include(widgets/widgets.pri)
 include(debugger/debugger.pri)
 
diff --git a/src/declarative/extra/extra.pri b/src/declarative/extra/extra.pri
deleted file mode 100644
index 85ff6ea..0000000
--- a/src/declarative/extra/extra.pri
+++ /dev/null
@@ -1,20 +0,0 @@
-SOURCES += \
-           extra/qnumberformat.cpp \
-           extra/qmlnumberformatter.cpp \
-           extra/qmldatetimeformatter.cpp \
-           extra/qmlbehavior.cpp \
-           extra/qmlfontloader.cpp
-
-HEADERS += \
-           extra/qnumberformat_p.h \
-           extra/qmlnumberformatter_p.h \
-           extra/qmldatetimeformatter_p.h \
-           extra/qmlbehavior_p.h \
-           extra/qmlfontloader_p.h
-
-contains(QT_CONFIG, xmlpatterns) {
-    QT+=xmlpatterns
-    SOURCES += extra/qmlxmllistmodel.cpp
-    HEADERS += extra/qmlxmllistmodel_p.h
-}
-
diff --git a/src/declarative/extra/qmlbehavior.cpp b/src/declarative/util/qmlbehavior.cpp
index 8364d8c..8364d8c 100644
--- a/src/declarative/extra/qmlbehavior.cpp
+++ b/src/declarative/util/qmlbehavior.cpp
diff --git a/src/declarative/extra/qmlbehavior_p.h b/src/declarative/util/qmlbehavior_p.h
index 9f85f84..9f85f84 100644
--- a/src/declarative/extra/qmlbehavior_p.h
+++ b/src/declarative/util/qmlbehavior_p.h
diff --git a/src/declarative/extra/qmldatetimeformatter.cpp b/src/declarative/util/qmldatetimeformatter.cpp
index 983287e..983287e 100644
--- a/src/declarative/extra/qmldatetimeformatter.cpp
+++ b/src/declarative/util/qmldatetimeformatter.cpp
diff --git a/src/declarative/extra/qmldatetimeformatter_p.h b/src/declarative/util/qmldatetimeformatter_p.h
index e350f96..e350f96 100644
--- a/src/declarative/extra/qmldatetimeformatter_p.h
+++ b/src/declarative/util/qmldatetimeformatter_p.h
diff --git a/src/declarative/extra/qmlfontloader.cpp b/src/declarative/util/qmlfontloader.cpp
index 36ee1bb..36ee1bb 100644
--- a/src/declarative/extra/qmlfontloader.cpp
+++ b/src/declarative/util/qmlfontloader.cpp
diff --git a/src/declarative/extra/qmlfontloader_p.h b/src/declarative/util/qmlfontloader_p.h
index d02a181..d02a181 100644
--- a/src/declarative/extra/qmlfontloader_p.h
+++ b/src/declarative/util/qmlfontloader_p.h
diff --git a/src/declarative/extra/qmlnumberformatter.cpp b/src/declarative/util/qmlnumberformatter.cpp
index b09be5b..b09be5b 100644
--- a/src/declarative/extra/qmlnumberformatter.cpp
+++ b/src/declarative/util/qmlnumberformatter.cpp
diff --git a/src/declarative/extra/qmlnumberformatter_p.h b/src/declarative/util/qmlnumberformatter_p.h
index 0036cb9..0036cb9 100644
--- a/src/declarative/extra/qmlnumberformatter_p.h
+++ b/src/declarative/util/qmlnumberformatter_p.h
diff --git a/src/declarative/extra/qmlxmllistmodel.cpp b/src/declarative/util/qmlxmllistmodel.cpp
index 3d90b44..3d90b44 100644
--- a/src/declarative/extra/qmlxmllistmodel.cpp
+++ b/src/declarative/util/qmlxmllistmodel.cpp
diff --git a/src/declarative/extra/qmlxmllistmodel_p.h b/src/declarative/util/qmlxmllistmodel_p.h
index 18bf9d2..18bf9d2 100644
--- a/src/declarative/extra/qmlxmllistmodel_p.h
+++ b/src/declarative/util/qmlxmllistmodel_p.h
diff --git a/src/declarative/extra/qnumberformat.cpp b/src/declarative/util/qnumberformat.cpp
index c6a03e9..c6a03e9 100644
--- a/src/declarative/extra/qnumberformat.cpp
+++ b/src/declarative/util/qnumberformat.cpp
diff --git a/src/declarative/extra/qnumberformat_p.h b/src/declarative/util/qnumberformat_p.h
index 1a7b8e4..1a7b8e4 100644
--- a/src/declarative/extra/qnumberformat_p.h
+++ b/src/declarative/util/qnumberformat_p.h
diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri
index f955ef6..4223f4e 100644
--- a/src/declarative/util/util.pri
+++ b/src/declarative/util/util.pri
@@ -21,7 +21,12 @@ SOURCES += \
            util/qmltimer.cpp \
            util/qmlbind.cpp \
            util/qmlpropertymap.cpp \
-           util/qmlpixmapcache.cpp
+           util/qmlpixmapcache.cpp \
+           util/qnumberformat.cpp \
+           util/qmlnumberformatter.cpp \
+           util/qmldatetimeformatter.cpp \
+           util/qmlbehavior.cpp \
+           util/qmlfontloader.cpp
 
 HEADERS += \
            util/qmlview.h \
@@ -49,4 +54,15 @@ HEADERS += \
            util/qmltimer_p.h \
            util/qmlbind_p.h \
            util/qmlpropertymap_p.h \
-           util/qmlpixmapcache_p.h
+           util/qmlpixmapcache_p.h \
+           util/qnumberformat_p.h \
+           util/qmlnumberformatter_p.h \
+           util/qmldatetimeformatter_p.h \
+           util/qmlbehavior_p.h \
+           util/qmlfontloader_p.h
+
+contains(QT_CONFIG, xmlpatterns) {
+    QT+=xmlpatterns
+    SOURCES += util/qmlxmllistmodel.cpp
+    HEADERS += util/qmlxmllistmodel_p.h
+}