diff --git a/doc/images/qmldesigner-element-properties.png b/doc/images/qmldesigner-element-properties.png index 66f0fa2dd2c..6df75cc67ad 100644 Binary files a/doc/images/qmldesigner-element-properties.png and b/doc/images/qmldesigner-element-properties.png differ diff --git a/doc/images/qmldesigner-properties-explicit-base.png b/doc/images/qmldesigner-properties-explicit-base.png index 9c4ce9eb62e..9ac69d413ee 100644 Binary files a/doc/images/qmldesigner-properties-explicit-base.png and b/doc/images/qmldesigner-properties-explicit-base.png differ diff --git a/doc/images/qmldesigner-properties-explicit-state1.png b/doc/images/qmldesigner-properties-explicit-state1.png index 0137b7fdf9f..dc4d5ab689b 100644 Binary files a/doc/images/qmldesigner-properties-explicit-state1.png and b/doc/images/qmldesigner-properties-explicit-state1.png differ diff --git a/doc/images/qmldesigner-qml-components.png b/doc/images/qmldesigner-qml-components.png index e4653da5409..a2b090dd372 100644 Binary files a/doc/images/qmldesigner-qml-components.png and b/doc/images/qmldesigner-qml-components.png differ diff --git a/doc/images/qmldesigner-visual-editor.png b/doc/images/qmldesigner-visual-editor.png index f78480e0ac8..92683ad0240 100644 Binary files a/doc/images/qmldesigner-visual-editor.png and b/doc/images/qmldesigner-visual-editor.png differ diff --git a/doc/images/qtquick-designer-color-picker.png b/doc/images/qtquick-designer-color-picker.png index d1b3b292f0f..541a8a9cac0 100644 Binary files a/doc/images/qtquick-designer-color-picker.png and b/doc/images/qtquick-designer-color-picker.png differ diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py index ae6bfc1f5ca..e8bc1425a75 100644 --- a/tests/system/shared/utils.py +++ b/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 diff --git a/tests/system/suite_APTW/tst_APTW03/test.py b/tests/system/suite_APTW/tst_APTW03/test.py index 04048854b86..fb04c53fa8b 100644 --- a/tests/system/suite_APTW/tst_APTW03/test.py +++ b/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'" diff --git a/tests/system/suite_general/tst_rename_file/test.py b/tests/system/suite_general/tst_rename_file/test.py index 3f0907759af..9d46be1d37f 100644 --- a/tests/system/suite_general/tst_rename_file/test.py +++ b/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) diff --git a/tests/system/suite_tools/tst_codepasting/test.py b/tests/system/suite_tools/tst_codepasting/test.py index 7329bdac2e4..4f1b4fedd32 100644 --- a/tests/system/suite_tools/tst_codepasting/test.py +++ b/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):