diff options
| author | The Qt Project <gerrit-noreply@qt-project.org> | 2020-07-06 14:24:55 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2020-07-06 14:24:55 +0000 |
| commit | 5671b3a7be0eeb94fa5fd273e1e23cd362647335 (patch) | |
| tree | d1e4d7ad6a5804ff0f567bfb6e714020485bfdd2 /tests | |
| parent | 8bd6453d767f6b658d5b91240eca307c767ca919 (diff) | |
| parent | b18711da91a01709f64c4b7d132509aa21ebe0da (diff) | |
Merge "Merge remote-tracking branch 'origin/4.12' into 4.13" into 4.13
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/system/suite_HELP/tst_HELP02/test.py | 1 | ||||
| -rw-r--r-- | tests/system/suite_tools/tst_git_clone/test.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/system/suite_HELP/tst_HELP02/test.py b/tests/system/suite_HELP/tst_HELP02/test.py index 2eb09773b1..1d776689be 100755 --- a/tests/system/suite_HELP/tst_HELP02/test.py +++ b/tests/system/suite_HELP/tst_HELP02/test.py @@ -78,6 +78,7 @@ def setKeyboardShortcutForAboutQtC(): modelIndex = waitForObject("{column='0' text='AboutQtCreator' type='QModelIndex' " "container={column='0' text='QtCreator' type='QModelIndex' " "container=%s}}" % objectMap.realName(treewidget)) + treewidget.scrollTo(modelIndex) mouseClick(modelIndex) shortcutGB = "{title='Shortcut' type='QGroupBox' unnamed='1' visible='1'}" record = waitForObject("{container=%s type='Core::Internal::ShortcutButton' unnamed='1' " diff --git a/tests/system/suite_tools/tst_git_clone/test.py b/tests/system/suite_tools/tst_git_clone/test.py index 476c1be365..35266deb8f 100644 --- a/tests/system/suite_tools/tst_git_clone/test.py +++ b/tests/system/suite_tools/tst_git_clone/test.py @@ -130,5 +130,5 @@ def main(): test.fail("The checked out project was not being opened.", str(waitForObject(":Cannot Open Project_QTextEdit").plainText)) clickButton(waitForObject(":Cannot Open Project.OK_QPushButton")) - verifyVersionControlView(targetDir, button == "Cancel immediately") + verifyVersionControlView(targetDir, button != ":Git Repository Clone.Finish_QPushButton") invokeMenuItem("File", "Exit") |