diff options
| author | Eike Ziller <[email protected]> | 2014-09-03 16:07:46 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2014-09-03 16:08:02 +0200 |
| commit | 49db3a450a6d15ae0327b8e3713920ac19320972 (patch) | |
| tree | 309c83eb1dbb6321845d6a1db8fbc49428b20340 /src/libs/qmljs/qmljsinterpreter.h | |
| parent | afd56bd8ada761b87c40d80a07cd3b3766b2d2f8 (diff) | |
| parent | d030a960a0e6e1dda89e20b60e5252842fe83f49 (diff) | |
Merge remote-tracking branch 'origin/3.2'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/coreplugin/editormanager/editormanager.cpp
src/plugins/cppeditor/cppeditor.cpp
src/plugins/remotelinux/remotelinuxdebugsupport.cpp
src/plugins/texteditor/basetexteditor.cpp
Change-Id: I0da7c1cf2506b12d0563795aa8177fc45e97050f
Diffstat (limited to 'src/libs/qmljs/qmljsinterpreter.h')
| -rw-r--r-- | src/libs/qmljs/qmljsinterpreter.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/qmljs/qmljsinterpreter.h b/src/libs/qmljs/qmljsinterpreter.h index f4721b99571..405a2f7a71f 100644 --- a/src/libs/qmljs/qmljsinterpreter.h +++ b/src/libs/qmljs/qmljsinterpreter.h @@ -1011,7 +1011,7 @@ public: // Other: non-absolute path QString name() const; - // LibraryImport: uri with QDir::separator separator + // LibraryImport: uri with '/' separator // Other: absoluteFilePath QString path() const; @@ -1088,7 +1088,7 @@ public: QString nameForImportedObject(const ObjectValue *value, const Context *context) const; bool importFailed() const; - QList<Import> all() const; + const QList<Import> &all() const; const TypeScope *typeScope() const; const JSImportScope *jsImportScope() const; |