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

QmlJS: update importFile and importModule signature.

Browse Source 
Update the signatures of importFile and importModule overridden methods
to match the new ones in parent class.

Change-Id: I8c5e7458935f848bc3952d4c388b5385dd9a5da5
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Marco Benelli
2016-05-03 11:57:12 +02:00
committed by Marco Benelli
parent 1556a707c3
commit cc80ba2a7e
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libs/qmljs/qmljsdocument.cpp
View File

@@ -238,14 +238,19 @@ public:
{} {}
virtual void pragmaLibrary() { isLibrary = true; } virtual void pragmaLibrary() { isLibrary = true; }
virtual void importFile(const QString &jsfile, const QString &module) virtual void importFile(const QString &jsfile, const QString &module, int line, int column)
{ {
Q_UNUSED(line);
Q_UNUSED(column);
imports += ImportInfo::pathImport( imports += ImportInfo::pathImport(
documentPath, jsfile, LanguageUtils::ComponentVersion(), module); documentPath, jsfile, LanguageUtils::ComponentVersion(), module);
} }
virtual void importModule(const QString &uri, const QString &version, const QString &module) virtual void importModule(const QString &uri, const QString &version, const QString &module,
int line, int column)
{ {
Q_UNUSED(line);
Q_UNUSED(column);
imports += ImportInfo::moduleImport(uri, LanguageUtils::ComponentVersion(version), module); imports += ImportInfo::moduleImport(uri, LanguageUtils::ComponentVersion(version), module);
} }