diff options
| author | Silarn <jrim@rimpo.org> | 2019-07-05 16:28:33 -0500 |
|---|---|---|
| committer | Silarn <jrim@rimpo.org> | 2019-07-05 16:28:33 -0500 |
| commit | 5feff2f997f10724739ca12754f99806dfc61980 (patch) | |
| tree | 95b7ddb3c77e20c104cc18903c304aed405d7aee /src/tutorials/tutorial_conflictresolution_main.js | |
| parent | 9a795c3ce90bc221574e909db1665f2bc64800ed (diff) | |
| parent | 7e760c700a89114909e607bd94a7c4ea5ed8319c (diff) | |
Merge remote-tracking branch 'origin/Develop' into qt-5.13
Diffstat (limited to 'src/tutorials/tutorial_conflictresolution_main.js')
| -rw-r--r-- | src/tutorials/tutorial_conflictresolution_main.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tutorials/tutorial_conflictresolution_main.js b/src/tutorials/tutorial_conflictresolution_main.js index 404afe5d..a2aa278d 100644 --- a/src/tutorials/tutorial_conflictresolution_main.js +++ b/src/tutorials/tutorial_conflictresolution_main.js @@ -65,7 +65,7 @@ function getTutorialSteps() { },
function() {
tutorial.text = qsTr("Option A: Switch to the \"Data\"-tab if necessary")
- if (!tutorialControl.waitForTabOpen("tabWidget", 2)) {
+ if (!tutorialControl.waitForTabOpen("tabWidget", "dataTab")) {
highlightItem("tabWidget", false)
waitForClick()
} else {
@@ -107,7 +107,7 @@ function getTutorialSteps() { function() {
tutorial.text = qsTr("Please open the \"Plugins\"-tab...")
highlightItem("tabWidget", true)
- if (!tutorialControl.waitForTabOpen("tabWidget", 0)) {
+ if (!tutorialControl.waitForTabOpen("tabWidget", "espTab")) {
nextStep()
}
},
|