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

Merge remote-tracking branch 'origin/4.14'

Browse Source 
Change-Id: I2ae0eb18782224e48cd20d41907f9dfea6ee1771
This commit is contained in:
Eike Ziller
2020-11-10 13:42:46 +01:00
parent 2ecfda056b 0eb65f7211
commit 1d2b5db02f
466 changed files with 7273 additions and 1261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/clangcodemodel/clangfollowsymbol.cpp
View File

@@ -75,8 +75,8 @@ static bool isValidIncludePathToken(const ClangBackEnd::TokenInfoContainer &toke
if (!token.extraInfo.includeDirectivePath)
return false;
const Utf8String &tokenName = token.extraInfo.token;
return !tokenName.startsWith("include") && tokenName != "<" && tokenName != ">"
&& tokenName != "#";
return !tokenName.startsWith("include") && tokenName != Utf8String("<")
&& tokenName != Utf8String(">") && tokenName != Utf8String("#");
}
static int includePathStartIndex(const QVector<ClangBackEnd::TokenInfoContainer> &marks,