Merge remote-tracking branch 'origin/3.2'

Conflicts:
	src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp
	src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp

Change-Id: I1627f6aa98a442413f8b08b579ecaf9647dc887b

src/libs/utils/uncommentselection.cpp

@@ -239,6 +239,8 @@ void Utils::unCommentSelection(QPlainTextEdit *edit, const CommentDefinition &de
         }
     }
 
+    cursor.endEditBlock();
+
     // adjust selection when commenting out
     if (hasSelection && !doMultiLineStyleUncomment && !doSingleLineStyleUncomment) {
         cursor = edit->textCursor();
@@ -254,6 +256,4 @@ void Utils::unCommentSelection(QPlainTextEdit *edit, const CommentDefinition &de
         }
         edit->setTextCursor(cursor);
     }
-
-    cursor.endEditBlock();
 }