diff options
| author | Christian Kamm <christian.d.kamm@nokia.com> | 2011-05-12 15:29:00 +0200 |
|---|---|---|
| committer | Christian Kamm <christian.d.kamm@nokia.com> | 2011-05-12 15:29:41 +0200 |
| commit | cf15e14e5e527b265939295f6b4342f8db05ccc4 (patch) | |
| tree | 545cb5e65a2df75258b137d3ad8f24ae6a02e4d0 /src/libs/qmljs/qmljslink.h | |
| parent | 04c5425de2292c9da66c7c1dd2ae0c646528ca07 (diff) | |
QmlJS: Add tooltips to imports.
Task-number: QTCREATORBUG-4814
Diffstat (limited to 'src/libs/qmljs/qmljslink.h')
| -rw-r--r-- | src/libs/qmljs/qmljslink.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/libs/qmljs/qmljslink.h b/src/libs/qmljs/qmljslink.h index b94ef86e99..338dd11d22 100644 --- a/src/libs/qmljs/qmljslink.h +++ b/src/libs/qmljs/qmljslink.h @@ -74,14 +74,17 @@ private: void linkImports(); void populateImportedTypes(Interpreter::TypeEnvironment *typeEnv, Document::Ptr doc); - Interpreter::ObjectValue *importFileOrDirectory(Document::Ptr doc, const Interpreter::ImportInfo &importInfo); - Interpreter::ObjectValue *importNonFile(Document::Ptr doc, const Interpreter::ImportInfo &importInfo); + Interpreter::TypeEnvironment::Import importFileOrDirectory( + Document::Ptr doc, + const Interpreter::ImportInfo &importInfo); + Interpreter::TypeEnvironment::Import importNonFile( + Document::Ptr doc, + const Interpreter::ImportInfo &importInfo); void importObject(Bind *bind, const QString &name, Interpreter::ObjectValue *object, NameId *targetNamespace); bool importLibrary(Document::Ptr doc, - Interpreter::ObjectValue *import, const QString &libraryPath, - const Interpreter::ImportInfo &importInfo, + Interpreter::TypeEnvironment::Import *import, const QString &importPath = QString()); void loadQmldirComponents(Interpreter::ObjectValue *import, LanguageUtils::ComponentVersion version, |