diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-09-23 10:10:09 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-09-23 10:10:09 +0200 |
| commit | d6c73653ed14fb1401acec6f9a9f86888a3238e4 (patch) | |
| tree | 1ed25da29595ac43731f10af10575ee06ff86e7a /src/plugins/cpptools/cpptoolsreuse.cpp | |
| parent | 205de01abf5e0c0e356f48029632775a74a268dd (diff) | |
| parent | faeac783f0f8de72771e8ff8d6bb7b908a00c277 (diff) | |
| download | qt-creator-d6c73653ed14fb1401acec6f9a9f86888a3238e4.tar.gz | |
Merge remote-tracking branch 'origin/3.2'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/cpptools/cppmodelmanager.cpp
src/plugins/texteditor/basetexteditor.cpp
src/plugins/texteditor/basetexteditor.h
Change-Id: I556a7661872b90b329a46694e335e18cddc28677
Diffstat (limited to 'src/plugins/cpptools/cpptoolsreuse.cpp')
| -rw-r--r-- | src/plugins/cpptools/cpptoolsreuse.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cpptoolsreuse.cpp b/src/plugins/cpptools/cpptoolsreuse.cpp index ce8b73c4bc..d3211841fb 100644 --- a/src/plugins/cpptools/cpptoolsreuse.cpp +++ b/src/plugins/cpptools/cpptoolsreuse.cpp @@ -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) |