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

13
src/plugins/qmljseditor/qmljsmodelmanager.cpp
View File

@@ -89,6 +89,9 @@ void ModelManager::loadQmlTypeDescriptions()
const QStringList errors = Interpreter::CppQmlTypesLoader::load(xmlFiles);
foreach (const QString &error, errors)
qWarning() << qPrintable(error);
// loads the builtin types
loadQmlPluginTypes(QString());
}
Snapshot ModelManager::snapshot() const
@@ -493,7 +496,11 @@ void ModelManager::qmlPluginTypeDumpDone(int exitCode)
QMutexLocker locker(&m_mutex);
LibraryInfo libraryInfo = _snapshot.libraryInfo(libraryPath);
libraryInfo.setMetaObjects(objectsList);
_snapshot.insertLibraryInfo(libraryPath, libraryInfo);
if (!libraryPath.isEmpty()) {
LibraryInfo libraryInfo = _snapshot.libraryInfo(libraryPath);
libraryInfo.setMetaObjects(objectsList);
_snapshot.insertLibraryInfo(libraryPath, libraryInfo);
} else {
Interpreter::CppQmlTypesLoader::builtinObjects.append(objectsList);
}
}