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

QmlJS: Delay loading of default QML type descriptions

Browse Source 
We definitely do not need to do this during startup of Qt Creator, delay
to first use.

Change-Id: I5942b5346aedc3d6b677918ad28a6c2924d09493
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Eike Ziller
2023-09-06 10:28:36 +02:00
parent 68d12f0724
commit 7082d2a89b
7 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1321,10 +1321,32 @@ const Function *Function::asFunction() const
// typing environment
////////////////////////////////////////////////////////////////////////////////
CppQmlTypesLoader::BuiltinObjects CppQmlTypesLoader::defaultLibraryObjects;
CppQmlTypesLoader::BuiltinObjects CppQmlTypesLoader::defaultQtObjects;
CppQmlTypesLoader::BuiltinObjects sDefaultLibraryObjects;
CppQmlTypesLoader::BuiltinObjects sDefaultQtObjects;
std::function<void()> CppQmlTypesLoader::defaultObjectsInitializer;
CppQmlTypesLoader::BuiltinObjects CppQmlTypesLoader::loadQmlTypes(const QFileInfoList &qmlTypeFiles, QStringList *errors, QStringList *warnings)
CppQmlTypesLoader::BuiltinObjects &CppQmlTypesLoader::defaultQtObjects()
{
if (defaultObjectsInitializer) {
const std::function<void()> init = defaultObjectsInitializer;
defaultObjectsInitializer = {};
init();
}
return sDefaultLibraryObjects;
}
CppQmlTypesLoader::BuiltinObjects &CppQmlTypesLoader::defaultLibraryObjects()
{
if (defaultObjectsInitializer) {
const std::function<void()> init = defaultObjectsInitializer;
defaultObjectsInitializer = {};
init();
}
return sDefaultQtObjects;
}
CppQmlTypesLoader::BuiltinObjects CppQmlTypesLoader::loadQmlTypes(const QFileInfoList &qmlTypeFiles,
QStringList *errors,
QStringList *warnings)
{
QHash<QString, FakeMetaObject::ConstPtr> newObjects;
QStringList newDependencies;