Integrate merge-request #444 into branch 'master'

Joel Nordell (1):
      add ':' to electric keys for C++ indenting, and check for electric
         keys anywhere on line, not just at beginning

Request-url: http://gitorious.org/qt-creator/qt-creator/merge_requests/444
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>

src/plugins/cppeditor/cppeditor.cpp

@@ -843,7 +843,8 @@ bool CPPEditor::isElectricCharacter(const QChar &ch) const
 {
     if (ch == QLatin1Char('{') ||
         ch == QLatin1Char('}') ||
-        ch == QLatin1Char('#')) {
+        ch == QLatin1Char('#') ||
+        ch == QLatin1Char(':')) {
         return true;
     }
     return false;