diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-09-07 14:39:42 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-09-07 14:39:42 +0200 |
| commit | ac9f1f798c1fe99e99c029b5d9e496a410f337ae (patch) | |
| tree | de9a078e8b8256f788a3ac48c5ba63147a4116a5 /tests/system/suite_tools | |
| parent | b68d943c920bc76506eccdc4b2b08ce93d2f2585 (diff) | |
| parent | 1a64efd863507e47d161c82b2ffbae31c88ed452 (diff) | |
Merge remote-tracking branch 'origin/4.7'
Change-Id: Ifb51ca9893549c478e99c9fc3ea6c32d5d5a28a2
Diffstat (limited to 'tests/system/suite_tools')
8 files changed, 8 insertions, 8 deletions
diff --git a/tests/system/suite_tools/tst_codepasting/test.py b/tests/system/suite_tools/tst_codepasting/test.py index b91ce2e558..7f3b1760c7 100644 --- a/tests/system/suite_tools/tst_codepasting/test.py +++ b/tests/system/suite_tools/tst_codepasting/test.py @@ -172,7 +172,7 @@ def fetchSnippet(protocol, description, pasteId, skippedPasting): return pasteId def main(): - startApplication("qtcreator" + SettingsPath) + startQC() if not startedWithoutPluginError(): return protocolsToTest = [NAME_KDE, NAME_PBCA, NAME_PBCOM] diff --git a/tests/system/suite_tools/tst_designer_autocomplete/test.py b/tests/system/suite_tools/tst_designer_autocomplete/test.py index edb03c5f33..0b97efec6a 100644 --- a/tests/system/suite_tools/tst_designer_autocomplete/test.py +++ b/tests/system/suite_tools/tst_designer_autocomplete/test.py @@ -26,7 +26,7 @@ source("../../shared/qtcreator.py") def main(): - startApplication("qtcreator" + SettingsPath) + startQC() if not startedWithoutPluginError(): return createProject_Qt_GUI(tempDir(), "DesignerTestApp") diff --git a/tests/system/suite_tools/tst_designer_edit/test.py b/tests/system/suite_tools/tst_designer_edit/test.py index 4320769caa..3a9a4a0d5a 100644 --- a/tests/system/suite_tools/tst_designer_edit/test.py +++ b/tests/system/suite_tools/tst_designer_edit/test.py @@ -186,7 +186,7 @@ def verifyPreview(menuItems, comboItems): sendEvent("QCloseEvent", waitForObject(prev)) def main(): - startApplication("qtcreator" + SettingsPath) + startQC() if not startedWithoutPluginError(): return createProject_Qt_GUI(tempDir(), "DesignerTestApp", False) diff --git a/tests/system/suite_tools/tst_designer_goto_slot/test.py b/tests/system/suite_tools/tst_designer_goto_slot/test.py index 18aa5730b1..eadea648ae 100644 --- a/tests/system/suite_tools/tst_designer_goto_slot/test.py +++ b/tests/system/suite_tools/tst_designer_goto_slot/test.py @@ -26,7 +26,7 @@ source("../../shared/qtcreator.py") def main(): - startApplication("qtcreator" + SettingsPath) + startQC() if not startedWithoutPluginError(): return createProject_Qt_GUI(tempDir(), "DesignerTestApp") diff --git a/tests/system/suite_tools/tst_git_clone/test.py b/tests/system/suite_tools/tst_git_clone/test.py index 6da11764ea..95ea891c4d 100644 --- a/tests/system/suite_tools/tst_git_clone/test.py +++ b/tests/system/suite_tools/tst_git_clone/test.py @@ -82,7 +82,7 @@ def verifyFiles(targetDir): "Verify the existence of %s" % file) def main(): - startApplication("qtcreator" + SettingsPath) + startQC() if not startedWithoutPluginError(): return for button in ["Cancel immediately", diff --git a/tests/system/suite_tools/tst_git_first_commit/test.py b/tests/system/suite_tools/tst_git_first_commit/test.py index c0fb3b9993..8a83dfa9cb 100644 --- a/tests/system/suite_tools/tst_git_first_commit/test.py +++ b/tests/system/suite_tools/tst_git_first_commit/test.py @@ -30,7 +30,7 @@ def main(): if not neededFilePresent(pathReadme): return - startApplication("qtcreator" + SettingsPath) + startQC() if not startedWithoutPluginError(): return diff --git a/tests/system/suite_tools/tst_git_local/test.py b/tests/system/suite_tools/tst_git_local/test.py index 4998c393e0..72943b3eb2 100644 --- a/tests/system/suite_tools/tst_git_local/test.py +++ b/tests/system/suite_tools/tst_git_local/test.py @@ -161,7 +161,7 @@ def addEmptyFileOutsideProject(filename): __createProjectHandleLastPage__([filename], "Git", "<None>") def main(): - startApplication("qtcreator" + SettingsPath) + startQC() if not startedWithoutPluginError(): return createProject_Qt_GUI(srcPath, projectName, addToVersionControl = "Git") diff --git a/tests/system/suite_tools/tst_sort/test.py b/tests/system/suite_tools/tst_sort/test.py index 302815947b..01403fdd39 100644 --- a/tests/system/suite_tools/tst_sort/test.py +++ b/tests/system/suite_tools/tst_sort/test.py @@ -26,7 +26,7 @@ source("../../shared/qtcreator.py") def main(): - startApplication("qtcreator" + SettingsPath) + startQC() if not startedWithoutPluginError(): return invokeMenuItem("File", "Open File or Project...") |