From 2665eced9b6ae9c6e8d8cc698c9a13017657945f Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 26 Aug 2013 11:19:31 +0200 Subject: [PATCH] Squish: Move common function to shared script Change-Id: I59d341f9f7a5c86bc3b723dbdc1e1596d464c92c Reviewed-by: Robert Loehning --- tests/system/shared/project.py | 10 ++++++++++ tests/system/suite_WELP/tst_WELP03/test.py | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index d99c6565bd3..706dfeb0554 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -584,3 +584,13 @@ def addCPlusPlusFileToCurrentProject(name, template, forceOverwrite=False): buttonToClick = 'Cancel' clickButton("{text='%s' type='QPushButton' unnamed='1' visible='1' window=%s}" % (buttonToClick, overwriteDialog)) + +def qt5SDKPath(): + if platform.system() in ('Microsoft', 'Windows'): + return os.path.abspath("C:/Qt/Qt5.0.1/5.0.1/msvc2010") + elif platform.system() == 'Linux': + if __is64BitOS__(): + return os.path.expanduser("~/Qt5.0.1/5.0.1/gcc_64") + return os.path.expanduser("~/Qt5.0.1/5.0.1/gcc") + else: + return os.path.expanduser("~/Qt5.0.1/5.0.1/clang_64") diff --git a/tests/system/suite_WELP/tst_WELP03/test.py b/tests/system/suite_WELP/tst_WELP03/test.py index aadc8c38969..61eb2018e17 100644 --- a/tests/system/suite_WELP/tst_WELP03/test.py +++ b/tests/system/suite_WELP/tst_WELP03/test.py @@ -59,16 +59,6 @@ def handlePackagingMessageBoxes(): except: break -def qt5SDKPath(): - if platform.system() in ('Microsoft', 'Windows'): - return os.path.abspath("C:/Qt/Qt5.0.1/5.0.1/msvc2010") - elif platform.system() == 'Linux': - if __is64BitOS__(): - return os.path.expanduser("~/Qt5.0.1/5.0.1/gcc_64") - return os.path.expanduser("~/Qt5.0.1/5.0.1/gcc") - else: - return os.path.expanduser("~/Qt5.0.1/5.0.1/clang_64") - def main(): global sdkPath, webPageContentLoadedValue # open Qt Creator