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

Merge commit 'origin/1.3'

Browse Source 
Conflicts:
	src/plugins/debugger/debuggermanager.h
	src/plugins/qmleditor/qmleditorplugin.cpp
	src/plugins/qt4projectmanager/qt4runconfiguration.cpp
This commit is contained in:
con
2009-11-11 16:14:29 +01:00
parent 1a6f279314 8335a06ed4
commit 43bccb41ed
75 changed files with 786 additions and 608 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/cplusplus/FindUsages.cpp
View File

@@ -121,8 +121,7 @@ void FindUsages::reportResult(unsigned tokenIndex)
const int len = tk.f.length;
if (_future) {
const QString path = QDir::toNativeSeparators(_doc->fileName());
_future->reportResult(Usage(path, line, lineText, col, len));
_future->reportResult(Usage(_doc->fileName(), line, lineText, col, len));
}
_references.append(tokenIndex);