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

Merge remote-tracking branch 'origin/4.7'

Browse Source 
Change-Id: I3c5d7e9e8c589ad4425cd89d61e1f572f5cb7997
This commit is contained in:
Eike Ziller
2018-06-19 10:03:28 +02:00
parent 23e27ead9e 8623a93998
commit 3bbe535b95
110 changed files with 913 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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