Move QDeclarativeListModel and friends from util/ to qml/

QDeclarativeWorkerScript depends on QDeclarativeListModel et al, so the latter
should also reside under qml/.

Note that QDeclarativeOpenMetaObject also had to be moved, since
QDeclarativeListModel depends on it.

Change-Id: I164cba0e530d22b5771056a2acde12a18d5e83e1
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>

1 files changed, 0 insertions, 9 deletions

diff --git a/src/declarative/util/qdeclarativeutilmodule.cpp b/src/declarative/util/qdeclarativeutilmodule.cpp
index 4df3115eaf..511ccd3f36 100644
--- a/src/declarative/util/qdeclarativeutilmodule.cpp
+++ b/src/declarative/util/qdeclarativeutilmodule.cpp
@@ -47,8 +47,6 @@
 #include "qdeclarativeconnections_p.h"
 #include "qdeclarativesmoothedanimation_p.h"
 #include "qdeclarativefontloader_p.h"
-#include "qdeclarativelistaccessor_p.h"
-#include "qdeclarativelistmodel_p.h"
 #include "qdeclarativepackage_p.h"
 #include "qdeclarativepropertychanges_p.h"
 #include "qdeclarativespringanimation_p.h"
@@ -67,12 +65,6 @@
 #include <QtCore/qcoreapplication.h>
 #include <QtGui/QInputPanel>
 
-void QDeclarativeUtilModule::registerBaseTypes(const char *uri, int versionMajor, int versionMinor)
-{
-    qmlRegisterType<QDeclarativeListElement>(uri, versionMajor, versionMinor,"ListElement");
-    qmlRegisterCustomType<QDeclarativeListModel>(uri, versionMajor, versionMinor,"ListModel", new QDeclarativeListModelParser);
-}
-
 void QDeclarativeUtilModule::defineModule()
 {
     qmlRegisterUncreatableType<QInputPanel>("QtQuick",2,0,"InputPanel", QInputPanel::tr("InputPanel is an abstract class"));
@@ -115,5 +107,4 @@ void QDeclarativeUtilModule::defineModule()
 
     qmlRegisterCustomType<QDeclarativePropertyChanges>("QtQuick",2,0,"PropertyChanges", new QDeclarativePropertyChangesParser);
     qmlRegisterCustomType<QDeclarativeConnections>("QtQuick",2,0,"Connections", new QDeclarativeConnectionsParser);
-    registerBaseTypes("QtQuick",2,0);
 }