Commit b809e805 authored by Christian Stenger's avatar Christian Stenger

Squish: Fix trailing whitespace

Additionally pushing Cancel instead of OK when
leaving Options dialog (we don't change anything).

Change-Id: I67ff5a891dc3a038822ff42e798981f00d633e80
Reviewed-by: default avatarRobert Löhning <robert.loehning@nokia.com>
Reviewed-by: default avatarBill King <bill.king@nokia.com>
parent 82434277
...@@ -283,8 +283,8 @@ def getCorrectlyConfiguredTargets(): ...@@ -283,8 +283,8 @@ def getCorrectlyConfiguredTargets():
currentText = str(waitForObject(":QtSupport__Internal__QtVersionManager.QLabel").text) currentText = str(waitForObject(":QtSupport__Internal__QtVersionManager.QLabel").text)
matches = pattern.match(currentText) matches = pattern.match(currentText)
if matches: if matches:
target = matches.group("target") target = matches.group("target").strip()
version = matches.group("version") version = matches.group("version").strip()
if target in result: if target in result:
oldV = result[target] oldV = result[target]
if version not in oldV: if version not in oldV:
...@@ -292,7 +292,7 @@ def getCorrectlyConfiguredTargets(): ...@@ -292,7 +292,7 @@ def getCorrectlyConfiguredTargets():
result.update({target:oldV}) result.update({target:oldV})
else: else:
result.update({target:[version]}) result.update({target:[version]})
clickButton(waitForObject(":Options.OK_QPushButton")) clickButton(waitForObject(":Options.Cancel_QPushButton"))
test.log("Correctly configured targets: %s" % str(result)) test.log("Correctly configured targets: %s" % str(result))
return result return result
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment