diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-11-09 13:30:40 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-11-09 13:30:40 +0100 |
| commit | 3666e3aaeb26f91097a473491ea4cf58219029ca (patch) | |
| tree | 2d1387557e243eacfe78698371c7726aa9a19350 /src/plugins/classview/classviewparser.cpp | |
| parent | 951eb885af8692c2c4aac67d18e3cbf033b7e912 (diff) | |
| parent | dc82e49b62d6b851900689321828aee95f8eab54 (diff) | |
| download | qt-creator-3666e3aaeb26f91097a473491ea4cf58219029ca.tar.gz | |
Merge remote-tracking branch 'origin/4.8'
Conflicts:
tests/unit/unittest/unittest.pro
Change-Id: I4f0ab05f96ee60900a3a35fad4c7331238367593
Diffstat (limited to 'src/plugins/classview/classviewparser.cpp')
| -rw-r--r-- | src/plugins/classview/classviewparser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/classview/classviewparser.cpp b/src/plugins/classview/classviewparser.cpp index 5dc37c528c..14034b46a3 100644 --- a/src/plugins/classview/classviewparser.cpp +++ b/src/plugins/classview/classviewparser.cpp @@ -366,9 +366,9 @@ void Parser::addSymbol(const ParserTreeItem::Ptr &item, const CPlusPlus::Symbol if (itemAdd.isNull()) itemAdd = ParserTreeItem::Ptr(new ParserTreeItem()); - // locations are 1-based in Symbol, start with 0 for the editor + // locations have 1-based column in Symbol, use the same here. SymbolLocation location(QString::fromUtf8(symbol->fileName() , symbol->fileNameLength()), - symbol->line(), symbol->column() - 1); + symbol->line(), symbol->column()); itemAdd->addSymbolLocation(location); // prevent showing a content of the functions |