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

Merge remote-tracking branch 'origin/3.2'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cpptools/cppmodelmanager.cpp
	src/plugins/texteditor/basetexteditor.cpp
	src/plugins/texteditor/basetexteditor.h

Change-Id: I556a7661872b90b329a46694e335e18cddc28677
This commit is contained in:
Eike Ziller
2014-09-23 10:10:09 +02:00
parent 205de01abf faeac783f0
commit d6c73653ed
14 changed files with 773 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cpptools/cpptoolsreuse.cpp
View File

@@ -117,7 +117,7 @@ bool isOwnershipRAIIType(CPlusPlus::Symbol *symbol, const LookupContext &context
bool isValidAsciiIdentifierChar(const QChar &ch)
{
return ch.isLetterOrNumber() || ch == QLatin1Char(' ');
return ch.isLetterOrNumber() || ch == QLatin1Char('_');
}
bool isValidFirstIdentifierChar(const QChar &ch)