Merge remote-tracking branch 'origin/4.7'

Change-Id: I562b0b8afb98940e03b67cbd7d7c3e756b77d736

src/libs/qmljs/qmljsreformatter.cpp

@@ -173,8 +173,11 @@ protected:
         QStringList lines = str.split(QLatin1Char('\n'));
         bool multiline = lines.length() > 1;
         for (int i = 0; i < lines.size(); ++i) {
-            if (multiline)
+            if (multiline) {
+                if (i == 0)
+                    newLine();
                 _line = lines.at(i);  // multiline comments don't keep track of previos lines
+            }
             else
                 _line += lines.at(i);
             if (i != lines.size() - 1)

src/plugins/vcsbase/baseannotationhighlighter.cpp

@@ -25,6 +25,7 @@
 
 #include "baseannotationhighlighter.h"
 #include <texteditor/fontsettings.h>
+#include <texteditor/texteditorsettings.h>
 
 #include <QDebug>
 #include <QColor>
@@ -63,8 +64,10 @@ public:
 
 void BaseAnnotationHighlighterPrivate::updateOtherFormats()
 {
-    m_background = q->formatForCategory(TextEditor::C_TEXT)
+    m_background = TextEditor::TextEditorSettings::fontSettings()
-            .brushProperty(QTextFormat::BackgroundBrush).color();
+                       .toTextCharFormat(TextEditor::C_TEXT)
+                       .brushProperty(QTextFormat::BackgroundBrush)
+                       .color();
     q->setChangeNumbers(m_changeNumberMap.keys().toSet());
 }
 

tests/system/suite_CSUP/tst_CSUP01/test.py

@@ -133,3 +133,4 @@ def main():
             # exit qt creator
             invokeMenuItem("File", "Save All")
             invokeMenuItem("File", "Exit")
+            waitForCleanShutdown()

tests/system/suite_CSUP/tst_CSUP02/test.py

@@ -87,3 +87,4 @@ def main():
             invokeMenuItem('File', 'Close "main.cpp"')
             # exit qt creator
             invokeMenuItem("File", "Exit")
+            waitForCleanShutdown()

tests/system/suite_CSUP/tst_CSUP03/test.py

@@ -123,3 +123,4 @@ def main():
             snooze(1)   # "Close All" might be disabled
             invokeMenuItem('File', 'Close All')
             invokeMenuItem('File', 'Exit')
+            waitForCleanShutdown()

tests/system/suite_CSUP/tst_CSUP04/test.py

@@ -78,3 +78,4 @@ def main():
             validateSearchResult(5 if JIRA.isBugStillOpen(2863) else 3)
             invokeMenuItem("File", "Close All")
             invokeMenuItem("File", "Exit")
+            waitForCleanShutdown()

tests/system/suite_CSUP/tst_CSUP05/test.py

@@ -94,3 +94,4 @@ def main():
             invokeMenuItem("File", "Close All")
             clickButton(waitForObject(":Save Changes.Do not Save_QPushButton"))
             invokeMenuItem("File", "Exit")
+            waitForCleanShutdown()

tests/system/suite_CSUP/tst_CSUP06/test.py

@@ -181,3 +181,4 @@ def main():
             # editor must be closed to get the second code model applied on re-opening the file
             invokeMenuItem('File', 'Close "main.cpp"')
             invokeMenuItem("File", "Exit")
+            waitForCleanShutdown()

tests/system/suite_editors/tst_memberoperator/test.py

@@ -54,3 +54,4 @@ def main():
             snooze(1)
             invokeMenuItem("File", "Close All")
             invokeMenuItem("File", "Exit")
+            waitForCleanShutdown()