diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-27 18:20:00 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-27 18:20:00 +0100 |
| commit | f013c41d05c82e853a3418d4e980329e1f883b7a (patch) | |
| tree | 87318eea4f6f06556673c64a64044d49a97a28e6 /src/plugins/cpptools/cppcodeformatter.cpp | |
| parent | 187bb36945a653cdf9738a6563475c87b9db911d (diff) | |
| parent | 0afa004c0b929ee722037bee26c1c45910fda8c5 (diff) | |
| download | qt-creator-f013c41d05c82e853a3418d4e980329e1f883b7a.tar.gz | |
Merge remote-tracking branch 'origin/3.1'
Conflicts:
src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
Change-Id: Icce6e8dd9b3afd9a0fe836e9babfb7a17cee9c4d
Diffstat (limited to 'src/plugins/cpptools/cppcodeformatter.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppcodeformatter.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cppcodeformatter.cpp b/src/plugins/cpptools/cppcodeformatter.cpp index d63fc49f43..c2ac2fb88d 100644 --- a/src/plugins/cpptools/cppcodeformatter.cpp +++ b/src/plugins/cpptools/cppcodeformatter.cpp @@ -169,6 +169,7 @@ void CodeFormatter::recalculateStateAfter(const QTextBlock &block) switch (kind) { case T_LESS: enter(template_param); break; case T_GREATER: leave(); break; + case T_GREATER_GREATER: leave(); leave(); break; // call leave twice to pop both template_param states } break; case operator_declaration: @@ -188,6 +189,7 @@ void CodeFormatter::recalculateStateAfter(const QTextBlock &block) case T_LBRACE: enter(defun_open); break; case T_COLON: enter(member_init_open); enter(member_init_expected); break; case T_OPERATOR: enter(operator_declaration); break; + case T_GREATER_GREATER: break; default: tryExpression(true); break; } break; |