Merge remote branch 'origin/2.1'

Conflicts:
	doc/qtcreator.qdoc
	share/qtcreator/templates/mobileapp/app.pro

src/plugins/cpptools/cppcodeformatter.cpp

@@ -93,6 +93,7 @@ void CodeFormatter::recalculateStateAfter(const QTextBlock &block)
         case namespace_start:
             switch (kind) {
             case T_LBRACE:      enter(namespace_open); break;
+            case T_SEMICOLON:
             case T_RBRACE:      leave(); break;
             } break;