summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cppcodeformatter.cpp
diff options
context:
space:
mode:
authorDave Lewis <dmlewis@g.clemson.edu>2014-03-17 15:30:42 -0400
committerErik Verbruggen <erik.verbruggen@digia.com>2014-03-25 15:33:32 +0100
commita8c858acdd264bed457b09d2b7030280b3fde7d2 (patch)
tree6fda28e34de093c8b2cc7cd2e2a242f98065a23e /src/plugins/cpptools/cppcodeformatter.cpp
parent5510ec0552001e12706e20ab6919a57ac2717726 (diff)
downloadqt-creator-a8c858acdd264bed457b09d2b7030280b3fde7d2.tar.gz
CppTools: Fix indent after ">>" in return type
Add case for ">>" token in declaration_start state to prevent falling through to stream_op. Task-number: QTCREATORBUG-9199 Change-Id: I53710be55eff4574de89f9159e95bbc1de2ba34e Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cppcodeformatter.cpp')
-rw-r--r--src/plugins/cpptools/cppcodeformatter.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cppcodeformatter.cpp b/src/plugins/cpptools/cppcodeformatter.cpp
index dc01741e84..c2ac2fb88d 100644
--- a/src/plugins/cpptools/cppcodeformatter.cpp
+++ b/src/plugins/cpptools/cppcodeformatter.cpp
@@ -189,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;