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

Merge remote-tracking branch 'origin/4.6'

Browse Source 
Conflicts:
	src/plugins/coreplugin/locator/locator.cpp
	src/plugins/imageviewer/imageviewerplugin.cpp
	src/plugins/remotelinux/remotelinuxplugin.cpp
	src/tools/clangbackend/source/tokeninfo.cpp
	tests/unit/unittest/data/highlightingmarks.cpp

Change-Id: I74cc3ba3a2836cb9d0e65d3380d8c4f88d720c67
This commit is contained in:
Eike Ziller
2018-02-07 11:58:23 +01:00
parent d3bb3c0953 631d9cd711
commit 5432dd1f5c
119 changed files with 1204 additions and 589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/clangbackend/source/tokeninfo.cpp
View File

@@ -330,8 +330,10 @@ void TokenInfo::typeKind(const Cursor &cursor)
void TokenInfo::identifierKind(const Cursor &cursor, Recursion recursion)
{
const CXCursorKind kind = cursor.kind();
if (cursor.isInvalidDeclaration())
return;
const CXCursorKind kind = cursor.kind();
switch (kind) {
case CXCursor_Destructor:
case CXCursor_Constructor: