Merge remote-tracking branch 'origin/9.0' into 10.0

 Conflicts:
	src/plugins/texteditor/codestyleselectorwidget.cpp
	src/plugins/updateinfo/updateinfoplugin.cpp

Change-Id: Iac33b852ccef6018bd81188716526aa70c3f5a2d

2 files changed, 8 insertions, 1 deletions

diff --git a/tests/system/shared/build_utils.py b/tests/system/shared/build_utils.py
index 6957d6dbbe..2e96dd9ba5 100644
--- a/tests/system/shared/build_utils.py
+++ b/tests/system/shared/build_utils.py
@@ -56,7 +56,7 @@ def waitForCompile(timeout=60000):
 def dumpBuildIssues(listModel):
     issueDump = []
     for index in dumpIndices(listModel):
-        issueDump.extend([[index.data(role).toString() for role
+        issueDump.extend([[str(index.data(role).toString()) for role
                            in range(Qt.UserRole, Qt.UserRole + 6)]])
     return issueDump
 
diff --git a/tests/system/suite_editors/tst_modify_readonly/test.py b/tests/system/suite_editors/tst_modify_readonly/test.py
index 446ca3569b..cf348bbed2 100644
--- a/tests/system/suite_editors/tst_modify_readonly/test.py
+++ b/tests/system/suite_editors/tst_modify_readonly/test.py
@@ -85,6 +85,13 @@ def testSaveChangesAndMakeWritable(modifiedFiles, readOnlyFiles):
     except:
         test.fatal("Missing dialog regarding missing permission on read only files.")
     exitCanceled = False
+
+    # workaround crashing test
+    # (AUT stopped responding / AUT '' did not respond to network communication)
+    __shutdownDone__ = lambda : not currentApplicationContext().isRunning
+    if test.verify(waitFor(__shutdownDone__, 1000), "Clean exit of Qt Creator."):
+        return
+
     try:
         mBoxStr = "{type='QMessageBox' unnamed='1' visible='1' text?='*Could not save the files.'}"
         msgBox = waitForObject(mBoxStr, 3000)