Merge remote-tracking branch 'origin/2.6'

Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/libs/utils/utils.pro

Change-Id: I6f0aba746f915d8c51dcf9372f7d9f593562fc2b

src/plugins/texteditor/basetexteditor.cpp

@@ -4066,7 +4066,7 @@ void BaseTextEditorWidget::updateHighlights()
             d->m_parenthesesMatchingTimer->start(50);
         } else {
              // use 0-timer, not direct call, to give the syntax highlighter a chance
-            // to update the parantheses information
+            // to update the parentheses information
             d->m_parenthesesMatchingTimer->start(0);
         }
     }