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

Merge remote-tracking branch 'origin/3.2'

Browse Source 
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
This commit is contained in:
Eike Ziller
2014-09-03 16:07:46 +02:00
parent afd56bd8ad d030a960a0
commit 49db3a450a
105 changed files with 11253 additions and 3805 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/qmljs/qmljsinterpreter.h
View File

@@ -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;