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

Merge remote-tracking branch 'origin/4.4'

Browse Source 
Conflicts:
	src/plugins/debugger/debuggerdialogs.cpp
	src/plugins/debugger/gdb/remotegdbserveradapter.cpp

Change-Id: I1ae77869887a8d9ef2a33439f2733315db9e0cf0
This commit is contained in:
Eike Ziller
2017-09-19 12:00:16 +02:00
parent fe1cbd0f87 b58dadfecc
commit 3d9cf954e2
40 changed files with 9999 additions and 6050 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/3rdparty/cplusplus/Keywords.cpp vendored
View File

@@ -255,8 +255,8 @@ static inline int classify5(const char *s, LanguageFeatures features)
}
}
}
else if (features.cxxEnabled && s[0] == 'f') {
if (s[1] == 'a') {
else if (s[0] == 'f') {
if (features.cxxEnabled && s[1] == 'a') {
if (s[2] == 'l') {
if (s[3] == 's') {
if (s[4] == 'e') {

6
src/libs/3rdparty/cplusplus/Symbols.cpp vendored
View File

@@ -106,7 +106,11 @@ Declaration::Declaration(Clone *clone, Subst *subst, Declaration *original)
, _initializer(clone->stringLiteral(original->_initializer))
{
const char* nameId = nullptr;
if (const Identifier* identifier = name()->identifier())
const Name *theName = name();
if (!theName)
return;
if (const Identifier* identifier = theName->identifier())
nameId = identifier->chars();
else
return;