diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2011-11-22 13:26:20 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-24 07:43:29 +0100 |
commit | dcc810fd6ae3042fb2877d617e21818b81b33ead (patch) | |
tree | 912db87a9431e751280c7f674278fc6c5ff1db45 /src | |
parent | 89e1cba2f671c1c46f81dcd36a168f469315c8ee (diff) |
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>
Diffstat (limited to 'src')
-rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 4 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativelistmodel.cpp (renamed from src/declarative/util/qdeclarativelistmodel.cpp) | 0 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativelistmodel_p.h (renamed from src/declarative/util/qdeclarativelistmodel_p.h) | 2 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativelistmodel_p_p.h (renamed from src/declarative/util/qdeclarativelistmodel_p_p.h) | 0 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativelistmodelworkeragent.cpp (renamed from src/declarative/util/qdeclarativelistmodelworkeragent.cpp) | 0 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativelistmodelworkeragent_p.h (renamed from src/declarative/util/qdeclarativelistmodelworkeragent_p.h) | 0 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativeopenmetaobject.cpp (renamed from src/declarative/util/qdeclarativeopenmetaobject.cpp) | 0 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativeopenmetaobject_p.h (renamed from src/declarative/util/qdeclarativeopenmetaobject_p.h) | 0 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativeworkerscript.cpp | 4 | ||||
-rw-r--r-- | src/declarative/qml/qlistmodelinterface.cpp (renamed from src/declarative/util/qlistmodelinterface.cpp) | 0 | ||||
-rw-r--r-- | src/declarative/qml/qlistmodelinterface_p.h (renamed from src/declarative/util/qlistmodelinterface_p.h) | 0 | ||||
-rw-r--r-- | src/declarative/qml/qml.pri | 9 | ||||
-rw-r--r-- | src/declarative/util/qdeclarativepropertychanges.cpp | 2 | ||||
-rw-r--r-- | src/declarative/util/qdeclarativepropertymap.cpp | 2 | ||||
-rw-r--r-- | src/declarative/util/qdeclarativeutilmodule.cpp | 9 | ||||
-rw-r--r-- | src/declarative/util/qdeclarativeutilmodule_p.h | 1 | ||||
-rw-r--r-- | src/declarative/util/util.pri | 9 |
17 files changed, 17 insertions, 25 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 05db2e8e21..b677a876b4 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -56,6 +56,7 @@ #include "qdeclarativesqldatabase_p.h" #include "qdeclarativescriptstring.h" #include "qdeclarativeglobal_p.h" +#include "qdeclarativelistmodel_p.h" #include "qdeclarativeworkerscript_p.h" #include "qdeclarativecomponent_p.h" #include "qdeclarativenetworkaccessmanagerfactory.h" @@ -103,7 +104,6 @@ void qmlRegisterBaseTypes(const char *uri, int versionMajor, int versionMinor) { QDeclarativeEnginePrivate::registerBaseTypes(uri, versionMajor, versionMinor); QDeclarativeValueTypeFactory::registerBaseTypes(uri, versionMajor, versionMinor); - QDeclarativeUtilModule::registerBaseTypes(uri, versionMajor, versionMinor); } /*! @@ -168,6 +168,8 @@ void QDeclarativeEnginePrivate::registerBaseTypes(const char *uri, int versionMa { qmlRegisterType<QDeclarativeComponent>(uri,versionMajor,versionMinor,"Component"); qmlRegisterType<QObject>(uri,versionMajor,versionMinor,"QtObject"); + qmlRegisterType<QDeclarativeListElement>(uri, versionMajor, versionMinor,"ListElement"); + qmlRegisterCustomType<QDeclarativeListModel>(uri, versionMajor, versionMinor,"ListModel", new QDeclarativeListModelParser); qmlRegisterType<QDeclarativeWorkerScript>(uri,versionMajor,versionMinor,"WorkerScript"); } diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/qml/qdeclarativelistmodel.cpp index 9e4d7269cd..9e4d7269cd 100644 --- a/src/declarative/util/qdeclarativelistmodel.cpp +++ b/src/declarative/qml/qdeclarativelistmodel.cpp diff --git a/src/declarative/util/qdeclarativelistmodel_p.h b/src/declarative/qml/qdeclarativelistmodel_p.h index 83a41ebc7b..2360f42dae 100644 --- a/src/declarative/util/qdeclarativelistmodel_p.h +++ b/src/declarative/qml/qdeclarativelistmodel_p.h @@ -50,7 +50,7 @@ #include <QtCore/QHash> #include <QtCore/QList> #include <QtCore/QVariant> -#include <private/qlistmodelinterface_p.h> +#include "qlistmodelinterface_p.h" #include <private/qv8engine_p.h> #include <private/qpodvector_p.h> diff --git a/src/declarative/util/qdeclarativelistmodel_p_p.h b/src/declarative/qml/qdeclarativelistmodel_p_p.h index ab6c2b25cc..ab6c2b25cc 100644 --- a/src/declarative/util/qdeclarativelistmodel_p_p.h +++ b/src/declarative/qml/qdeclarativelistmodel_p_p.h diff --git a/src/declarative/util/qdeclarativelistmodelworkeragent.cpp b/src/declarative/qml/qdeclarativelistmodelworkeragent.cpp index c01025cd45..c01025cd45 100644 --- a/src/declarative/util/qdeclarativelistmodelworkeragent.cpp +++ b/src/declarative/qml/qdeclarativelistmodelworkeragent.cpp diff --git a/src/declarative/util/qdeclarativelistmodelworkeragent_p.h b/src/declarative/qml/qdeclarativelistmodelworkeragent_p.h index 05c36473a5..05c36473a5 100644 --- a/src/declarative/util/qdeclarativelistmodelworkeragent_p.h +++ b/src/declarative/qml/qdeclarativelistmodelworkeragent_p.h diff --git a/src/declarative/util/qdeclarativeopenmetaobject.cpp b/src/declarative/qml/qdeclarativeopenmetaobject.cpp index d4dd8242c4..d4dd8242c4 100644 --- a/src/declarative/util/qdeclarativeopenmetaobject.cpp +++ b/src/declarative/qml/qdeclarativeopenmetaobject.cpp diff --git a/src/declarative/util/qdeclarativeopenmetaobject_p.h b/src/declarative/qml/qdeclarativeopenmetaobject_p.h index e5cfee7eb6..e5cfee7eb6 100644 --- a/src/declarative/util/qdeclarativeopenmetaobject_p.h +++ b/src/declarative/qml/qdeclarativeopenmetaobject_p.h diff --git a/src/declarative/qml/qdeclarativeworkerscript.cpp b/src/declarative/qml/qdeclarativeworkerscript.cpp index 98aaddceef..793bc24aa3 100644 --- a/src/declarative/qml/qdeclarativeworkerscript.cpp +++ b/src/declarative/qml/qdeclarativeworkerscript.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include "qdeclarativeworkerscript_p.h" -#include <private/qdeclarativelistmodel_p.h> -#include <private/qdeclarativelistmodelworkeragent_p.h> +#include "qdeclarativelistmodel_p.h" +#include "qdeclarativelistmodelworkeragent_p.h" #include "qdeclarativeengine_p.h" #include "qdeclarativeexpression_p.h" diff --git a/src/declarative/util/qlistmodelinterface.cpp b/src/declarative/qml/qlistmodelinterface.cpp index 4461456516..4461456516 100644 --- a/src/declarative/util/qlistmodelinterface.cpp +++ b/src/declarative/qml/qlistmodelinterface.cpp diff --git a/src/declarative/util/qlistmodelinterface_p.h b/src/declarative/qml/qlistmodelinterface_p.h index 340dfac258..340dfac258 100644 --- a/src/declarative/util/qlistmodelinterface_p.h +++ b/src/declarative/qml/qlistmodelinterface_p.h diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri index 444183eeab..928854ad62 100644 --- a/src/declarative/qml/qml.pri +++ b/src/declarative/qml/qml.pri @@ -1,6 +1,9 @@ SOURCES += \ $$PWD/qdeclarativeapplication.cpp \ $$PWD/qdeclarativeinstruction.cpp \ + $$PWD/qdeclarativelistmodel.cpp \ + $$PWD/qdeclarativelistmodelworkeragent.cpp \ + $$PWD/qdeclarativeopenmetaobject.cpp \ $$PWD/qdeclarativevmemetaobject.cpp \ $$PWD/qdeclarativeengine.cpp \ $$PWD/qdeclarativeexpression.cpp \ @@ -45,10 +48,15 @@ SOURCES += \ $$PWD/qdeclarativeimport.cpp \ $$PWD/qdeclarativelist.cpp \ $$PWD/qdeclarativelocale.cpp \ + $$PWD/qlistmodelinterface.cpp HEADERS += \ $$PWD/qdeclarativeglobal_p.h \ $$PWD/qdeclarativeinstruction_p.h \ + $$PWD/qdeclarativelistmodel_p.h\ + $$PWD/qdeclarativelistmodel_p_p.h\ + $$PWD/qdeclarativelistmodelworkeragent_p.h \ + $$PWD/qdeclarativeopenmetaobject_p.h \ $$PWD/qdeclarativevmemetaobject_p.h \ $$PWD/qdeclarative.h \ $$PWD/qdeclarativeapplication_p.h \ @@ -109,6 +117,7 @@ HEADERS += \ $$PWD/qdeclarativenullablevalue_p_p.h \ $$PWD/qdeclarativescriptstring_p.h \ $$PWD/qdeclarativelocale_p.h \ + $$PWD/qlistmodelinterface_p.h QT += sql include(parser/parser.pri) diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp index e9dc559d5e..d6035fa9d2 100644 --- a/src/declarative/util/qdeclarativepropertychanges.cpp +++ b/src/declarative/util/qdeclarativepropertychanges.cpp @@ -41,7 +41,7 @@ #include "qdeclarativepropertychanges_p.h" -#include "qdeclarativeopenmetaobject_p.h" +#include <private/qdeclarativeopenmetaobject_p.h> #include <private/qdeclarativerewrite_p.h> #include <private/qdeclarativeengine_p.h> diff --git a/src/declarative/util/qdeclarativepropertymap.cpp b/src/declarative/util/qdeclarativepropertymap.cpp index 1149683ea6..af8e7f64fb 100644 --- a/src/declarative/util/qdeclarativepropertymap.cpp +++ b/src/declarative/util/qdeclarativepropertymap.cpp @@ -42,7 +42,7 @@ #include "qdeclarativepropertymap.h" #include <private/qmetaobjectbuilder_p.h> -#include "qdeclarativeopenmetaobject_p.h" +#include <private/qdeclarativeopenmetaobject_p.h> #include <QDebug> 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); } diff --git a/src/declarative/util/qdeclarativeutilmodule_p.h b/src/declarative/util/qdeclarativeutilmodule_p.h index 42a1e02097..7304f6fd77 100644 --- a/src/declarative/util/qdeclarativeutilmodule_p.h +++ b/src/declarative/util/qdeclarativeutilmodule_p.h @@ -53,7 +53,6 @@ QT_MODULE(Declarative) class QDeclarativeUtilModule { public: - static void registerBaseTypes(const char *uri, int versionMajor, int versionMinor); static void defineModule(); }; diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri index a93fff7f89..e476db7925 100644 --- a/src/declarative/util/util.pri +++ b/src/declarative/util/util.pri @@ -12,9 +12,7 @@ SOURCES += \ $$PWD/qdeclarativepropertychanges.cpp \ $$PWD/qdeclarativestategroup.cpp \ $$PWD/qdeclarativetransition.cpp \ - $$PWD/qdeclarativelistmodel.cpp\ $$PWD/qdeclarativelistaccessor.cpp \ - $$PWD/qdeclarativeopenmetaobject.cpp \ $$PWD/qdeclarativetimeline.cpp \ $$PWD/qdeclarativetimer.cpp \ $$PWD/qdeclarativebind.cpp \ @@ -23,11 +21,9 @@ SOURCES += \ $$PWD/qdeclarativebehavior.cpp \ $$PWD/qdeclarativefontloader.cpp \ $$PWD/qdeclarativestyledtext.cpp \ - $$PWD/qdeclarativelistmodelworkeragent.cpp \ $$PWD/qdeclarativepath.cpp \ $$PWD/qdeclarativechangeset.cpp \ $$PWD/qdeclarativelistcompositor.cpp \ - $$PWD/qlistmodelinterface.cpp \ $$PWD/qdeclarativepathinterpolator.cpp \ $$PWD/qdeclarativesvgparser.cpp @@ -48,10 +44,7 @@ HEADERS += \ $$PWD/qdeclarativetransitionmanager_p_p.h \ $$PWD/qdeclarativestategroup_p.h \ $$PWD/qdeclarativetransition_p.h \ - $$PWD/qdeclarativelistmodel_p.h\ - $$PWD/qdeclarativelistmodel_p_p.h\ $$PWD/qdeclarativelistaccessor_p.h \ - $$PWD/qdeclarativeopenmetaobject_p.h \ $$PWD/qdeclarativetimeline_p_p.h \ $$PWD/qdeclarativetimer_p.h \ $$PWD/qdeclarativebind_p.h \ @@ -60,12 +53,10 @@ HEADERS += \ $$PWD/qdeclarativebehavior_p.h \ $$PWD/qdeclarativefontloader_p.h \ $$PWD/qdeclarativestyledtext_p.h \ - $$PWD/qdeclarativelistmodelworkeragent_p.h \ $$PWD/qdeclarativepath_p.h \ $$PWD/qdeclarativepath_p_p.h \ $$PWD/qdeclarativechangeset_p.h \ $$PWD/qdeclarativelistcompositor_p.h \ - $$PWD/qlistmodelinterface_p.h \ $$PWD/qdeclarativepathinterpolator_p.h \ $$PWD/qdeclarativesvgparser_p.h |