Merge remote-tracking branch 'origin/4.10'

Change-Id: I24ef6e5c83725185bafed04d38f2523f8aad1ddc

tests/system/shared/utils.py

@@ -99,7 +99,8 @@ def selectFromCombo(objectSpec, itemName):
     else:
         mouseClick(object)
         snooze(1)
-        mouseClick(waitForObjectItem(object, itemName.replace(".", "\\.")))
+        # params required here
+        mouseClick(waitForObjectItem(object, itemName.replace(".", "\\.")), 5, 5, 0, Qt.LeftButton)
         test.verify(waitFor("str(object.currentText)==itemName", 5000),
                     "Switched combo item to '%s'" % itemName)
         return True

tests/system/suite_APTW/tst_APTW03/test.py

@@ -29,7 +29,8 @@ def handleInsertVirtualFunctions(expected, toAdd):
     def __checkVirtualFunction(treeView, classIndex, isCheckedF, child):
         item = "%s.%s" % (str(classIndex.text), str(child.text))
         test.log("Checking '%s'." % item)
-        mouseClick(waitForObjectItem(treeView, item.replace("_", "\\_")))
+        # params required here
+        mouseClick(waitForObjectItem(treeView, item.replace("_", "\\_")), 5, 5, 0, Qt.LeftButton)
         test.verify(waitFor("isCheckedF(child)", 1000), "Function must be checked after clicking")
 
     treeView = waitForObject("{container={title='Functions to insert:' type='QGroupBox' unnamed='1'"

tests/system/suite_general/tst_rename_file/test.py

@@ -93,7 +93,9 @@ def renameFile(projectDir, proFile, branch, oldname, newname):
     try:
         openItemContextMenu(treeview, itemText, 5, 5, 0)
     except:
-        openItemContextMenu(treeview, addBranchWildcardToRoot(itemText), 5, 5, 0)
+        itemWithWildcard = addBranchWildcardToRoot(itemText)
+        waitForObjectItem(treeview, itemWithWildcard, 10000)
+        openItemContextMenu(treeview, itemWithWildcard, 5, 5, 0)
     # hack for Squish5/Qt5.2 problems of handling menus on Mac - remove asap
     if platform.system() == 'Darwin':
         waitFor("macHackActivateContextMenuItem('Rename...')", 5000)

tests/system/suite_tools/tst_codepasting/test.py

@@ -53,11 +53,11 @@ def closeHTTPStatusAndPasterDialog(protocol, pasterDialog):
         if 'Service Unavailable' in text:
             test.warning(text)
             return True
+        test.log("Closed dialog without expected error.", text)
     except:
         t,v = sys.exc_info()[:2]
         test.warning("An exception occurred in closeHTTPStatusAndPasterDialog(): %s(%s)"
                      % (str(t), str(v)))
-    test.log("Closed dialog without expected error.", text)
     return False
 
 def pasteFile(sourceFile, protocol):