Commit 79623d57 authored by Robert Loehning's avatar Robert Loehning

Squish: Base getPaths() on new path functions

Change-Id: I54cd03bc1d24b715df15de37291f776f9867416f
Reviewed-by: Christian Stenger's avatarChristian Stenger <christian.stenger@qt.io>
parent b04b5e5d
...@@ -178,29 +178,16 @@ class Qt5Path: ...@@ -178,29 +178,16 @@ class Qt5Path:
@staticmethod @staticmethod
def getPaths(pathSpec): def getPaths(pathSpec):
qt5targets = [Targets.DESKTOP_521_DEFAULT, Targets.DESKTOP_531_DEFAULT]
if platform.system() != 'Darwin':
qt5targets.append(Targets.DESKTOP_541_GCC)
if pathSpec == Qt5Path.DOCS: if pathSpec == Qt5Path.DOCS:
path52 = "/doc" return map(lambda target: Qt5Path.docsPath(target), qt5targets)
path53 = "/Docs/Qt-5.3"
path54 = "/Docs/Qt-5.4"
elif pathSpec == Qt5Path.EXAMPLES: elif pathSpec == Qt5Path.EXAMPLES:
path52 = "/examples" return map(lambda target: Qt5Path.examplesPath(target), qt5targets)
path53 = "/Examples/Qt-5.3"
path54 = "/Examples/Qt-5.4"
else: else:
test.fatal("Unknown pathSpec given: %s" % str(pathSpec)) test.fatal("Unknown pathSpec given: %s" % str(pathSpec))
return [] return []
if platform.system() in ('Microsoft', 'Windows'):
return ["C:/Qt/Qt5.2.1/5.2.1/msvc2010" + path52,
"C:/Qt/Qt5.3.1" + path53, "C:/Qt/Qt5.4.1" + path54]
elif platform.system() == 'Linux':
if __is64BitOS__():
return map(os.path.expanduser, ["~/Qt5.2.1/5.2.1/gcc_64" + path52,
"~/Qt5.3.1" + path53, "~/Qt5.4.1" + path54])
return map(os.path.expanduser, ["~/Qt5.2.1/5.2.1/gcc" + path52,
"~/Qt5.3.1" + path53, "~/Qt5.4.1" + path54])
else:
return map(os.path.expanduser, ["~/Qt5.2.1/5.2.1/clang_64" + path52,
"~/Qt5.3.1" + path53])
@staticmethod @staticmethod
def __preCheckAndExtractQtVersionStr__(target): def __preCheckAndExtractQtVersionStr__(target):
......
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