Qml code model: handle modules dependencies.

Fix the broken hierarchies between qml objects.

Change-Id: Id36c735cab0129af382fab7b9dd90c228304168c
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
This commit is contained in:
Marco Benelli
2016-02-26 17:28:30 +01:00
parent 94cba885bd
commit 22acc52d71
15 changed files with 461 additions and 30 deletions

View File

@@ -720,8 +720,12 @@ public:
// parses the contents of a qmltypes file and fills the newObjects map
static void parseQmlTypeDescriptions(const QByteArray &contents,
BuiltinObjects *newObjects,
QList<ModuleApiInfo> *newModuleApis, QString *errorMessage, QString *warningMessage, const QString &fileName);
BuiltinObjects *newObjects,
QList<ModuleApiInfo> *newModuleApis,
QStringList *newDependencies,
QString *errorMessage,
QString *warningMessage,
const QString &fileName);
};
class QMLJS_EXPORT FakeMetaObjectWithOrigin