feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJS: Get rid of xml file describing qml builtin types.

Browse Source 
The type information is now generated at runtime.
This commit is contained in:
Christian Kamm
2010-06-10 10:48:23 +02:00
parent e4871393c6
commit 45415783e7
4 changed files with 14 additions and 3178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/qmljs/qmljsinterpreter.cpp
View File

@@ -1939,7 +1939,7 @@ const Value *Function::invoke(const Activation *activation) const
// typing environment
////////////////////////////////////////////////////////////////////////////////
QList<const FakeMetaObject *> CppQmlTypesLoader::objectsFromXml;
QList<const FakeMetaObject *> CppQmlTypesLoader::builtinObjects;
QStringList CppQmlTypesLoader::load(const QFileInfoList &xmlFiles)
{
@@ -1968,7 +1968,7 @@ QStringList CppQmlTypesLoader::load(const QFileInfoList &xmlFiles)
QMapIterator<QString, FakeMetaObject *> it(newObjects);
while (it.hasNext()) {
it.next();
objectsFromXml.append(it.value());
builtinObjects.append(it.value());
}
}
@@ -2359,7 +2359,7 @@ Engine::Engine()
{
initializePrototypes();
_cppQmlTypes.load(this, CppQmlTypesLoader::objectsFromXml);
_cppQmlTypes.load(this, CppQmlTypesLoader::builtinObjects);
}
Engine::~Engine()

2
src/libs/qmljs/qmljsinterpreter.h
View File

@@ -517,7 +517,7 @@ class QMLJS_EXPORT CppQmlTypesLoader
public:
/** \return an empty list when successful, error messages otherwise. */
static QStringList load(const QFileInfoList &xmlFiles);
static QList<const FakeMetaObject *> objectsFromXml;
static QList<const FakeMetaObject *> builtinObjects;
// parses the xml string and fills the newObjects map
static QString parseQmlTypeXml(const QByteArray &xml, QMap<QString, FakeMetaObject *> *newObjects);