diff options
| author | Robert Loehning <robert.loehning@digia.com> | 2014-03-27 16:48:55 +0100 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@digia.com> | 2014-03-28 10:18:06 +0100 |
| commit | 9759d3bacb7d324745dc9ec18c8a5672070c1225 (patch) | |
| tree | d5acc8dbd64729b3636e0354e20a3f1637007719 | |
| parent | 51a2717f9a3edddb11808e90a9dc88b9d1760bfd (diff) | |
| download | qt-creator-9759d3bacb7d324745dc9ec18c8a5672070c1225.tar.gz | |
Squish: Fix modifyRunSettingsForHookIntoQtQuickUI for multiple kits
Change-Id: I3d42920edba4a750c27714d26c9143e48c17fd39
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
| -rw-r--r-- | tests/system/shared/hook_utils.py | 4 | ||||
| -rw-r--r-- | tests/system/suite_qtquick/tst_qtquick_creation3/test.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/system/shared/hook_utils.py b/tests/system/shared/hook_utils.py index bcc07ab4be..540c0702dc 100644 --- a/tests/system/shared/hook_utils.py +++ b/tests/system/shared/hook_utils.py @@ -90,9 +90,9 @@ def batchEditRunEnvironment(kitCount, currentTarget, modifications, alreadyOnRun clickButton(waitForObject("{text='OK' type='QPushButton' unnamed='1' visible='1' " "window=':Edit Environment_ProjectExplorer::EnvironmentItemsDialog'}")) -def modifyRunSettingsForHookIntoQtQuickUI(kitCount, workingDir, projectName, port, quickVersion="1.1"): +def modifyRunSettingsForHookIntoQtQuickUI(kitCount, kit, workingDir, projectName, port, quickVersion="1.1"): switchViewTo(ViewConstants.PROJECTS) - switchToBuildOrRunSettingsFor(kitCount, 0, ProjectSettings.RUN, True) + switchToBuildOrRunSettingsFor(kitCount, kit, ProjectSettings.RUN, True) qtVersion, mkspec, qtLibPath, qmake = getQtInformationForQmlProject() if None in (qtVersion, mkspec, qtLibPath, qmake): diff --git a/tests/system/suite_qtquick/tst_qtquick_creation3/test.py b/tests/system/suite_qtquick/tst_qtquick_creation3/test.py index ff24f7e179..1703e325f4 100644 --- a/tests/system/suite_qtquick/tst_qtquick_creation3/test.py +++ b/tests/system/suite_qtquick/tst_qtquick_creation3/test.py @@ -38,7 +38,7 @@ def main(): workingDir = tempDir() projectName = createNewQtQuickUI(workingDir, quickVersion) test.log("Running project Qt Quick %s UI" % quickVersion) - qmlViewer = modifyRunSettingsForHookIntoQtQuickUI(1, workingDir, projectName, 11223, quickVersion) + qmlViewer = modifyRunSettingsForHookIntoQtQuickUI(1, 0, workingDir, projectName, 11223, quickVersion) if qmlViewer!=None: qmlViewerPath = os.path.dirname(qmlViewer) qmlViewer = os.path.basename(qmlViewer) |