Commit c0272c79 authored by Robert Loehning's avatar Robert Loehning
Browse files

Squish: Updated used MSVC Qt versions



Change-Id: Id44c5715c48feeeec0c10a029556c25658e70e72
Reviewed-by: default avatarChristian Stenger <christian.stenger@digia.com>
parent 6df66e88
...@@ -98,13 +98,13 @@ ...@@ -98,13 +98,13 @@
<value type="QString" key="PE.Profile.Device">Desktop Device</value> <value type="QString" key="PE.Profile.Device">Desktop Device</value>
<value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value> <value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
<value type="QString" key="PE.Profile.SysRoot"></value> <value type="QString" key="PE.Profile.SysRoot"></value>
<value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Msvc:{b86e54dd-debd-409c-b4d7-1a5c710eaa37}</value> <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Msvc:{1186dad9-c485-4f69-b7e1-aff54c89ecb2}</value>
<value type="QString" key="QtPM4.mkSpecInformation"></value> <value type="QString" key="QtPM4.mkSpecInformation"></value>
<value type="int" key="QtSupport.QtInformation">7</value> <value type="int" key="QtSupport.QtInformation">2</value>
</valuemap> </valuemap>
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value> <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
<value type="QString" key="PE.Profile.Id">{9b35bbe6-25a7-4cce-ba07-487c795f5265}</value> <value type="QString" key="PE.Profile.Id">{9b35bbe6-25a7-4cce-ba07-487c795f5265}</value>
<value type="QString" key="PE.Profile.Name">Desktop 474 MSVC2008</value> <value type="QString" key="PE.Profile.Name">Desktop 480 MSVC2010</value>
<value type="bool" key="PE.Profile.SDK">false</value> <value type="bool" key="PE.Profile.SDK">false</value>
</valuemap> </valuemap>
</data> </data>
......
...@@ -36,14 +36,14 @@ class Targets: ...@@ -36,14 +36,14 @@ class Targets:
MAEMO5 = 4 MAEMO5 = 4
HARMATTAN = 8 HARMATTAN = 8
EMBEDDED_LINUX = 16 EMBEDDED_LINUX = 16
DESKTOP_474_MSVC2008 = 32 DESKTOP_480_MSVC2010 = 32
DESKTOP_501_DEFAULT = 64 DESKTOP_501_DEFAULT = 64
@staticmethod @staticmethod
def desktopTargetClasses(): def desktopTargetClasses():
desktopTargets = Targets.DESKTOP_474_GCC | Targets.DESKTOP_501_DEFAULT desktopTargets = Targets.DESKTOP_474_GCC | Targets.DESKTOP_501_DEFAULT
if platform.system() in ('Windows', 'Microsoft'): if platform.system() in ('Windows', 'Microsoft'):
desktopTargets |= Targets.DESKTOP_474_MSVC2008 desktopTargets |= Targets.DESKTOP_480_MSVC2010
return desktopTargets return desktopTargets
@staticmethod @staticmethod
...@@ -58,8 +58,8 @@ class Targets: ...@@ -58,8 +58,8 @@ class Targets:
return "Harmattan" return "Harmattan"
elif target == Targets.EMBEDDED_LINUX: elif target == Targets.EMBEDDED_LINUX:
return "Embedded Linux" return "Embedded Linux"
elif target == Targets.DESKTOP_474_MSVC2008: elif target == Targets.DESKTOP_480_MSVC2010:
return "Desktop 474 MSVC2008" return "Desktop 480 MSVC2010"
elif target == Targets.DESKTOP_501_DEFAULT: elif target == Targets.DESKTOP_501_DEFAULT:
return "Desktop 501 default" return "Desktop 501 default"
else: else:
...@@ -78,7 +78,7 @@ class Targets: ...@@ -78,7 +78,7 @@ class Targets:
@staticmethod @staticmethod
def intToArray(targets): def intToArray(targets):
available = [Targets.DESKTOP_474_GCC, Targets.SIMULATOR, Targets.MAEMO5, Targets.HARMATTAN, available = [Targets.DESKTOP_474_GCC, Targets.SIMULATOR, Targets.MAEMO5, Targets.HARMATTAN,
Targets.EMBEDDED_LINUX, Targets.DESKTOP_474_MSVC2008, Targets.EMBEDDED_LINUX, Targets.DESKTOP_480_MSVC2010,
Targets.DESKTOP_501_DEFAULT] Targets.DESKTOP_501_DEFAULT]
return filter(lambda x: x & targets == x, available) return filter(lambda x: x & targets == x, available)
......
...@@ -77,8 +77,7 @@ def openCmakeProject(projectPath, buildDir): ...@@ -77,8 +77,7 @@ def openCmakeProject(projectPath, buildDir):
generatorText = "Unix Generator (Desktop 474 GCC)" generatorText = "Unix Generator (Desktop 474 GCC)"
if "win32-" in mkspec: if "win32-" in mkspec:
generatorName = {"win32-g++" : "MinGW Generator (Desktop 474 GCC)", generatorName = {"win32-g++" : "MinGW Generator (Desktop 474 GCC)",
"win32-msvc2008" : "NMake Generator (Desktop 474 MSVC2008)", "win32-msvc2010" : "NMake Generator (Desktop 480 MSVC2010)"}
"win32-msvc2010" : "NMake Generator (Desktop 474 MSVC2010)"}
if mkspec in generatorName: if mkspec in generatorName:
generatorText = generatorName[mkspec] generatorText = generatorName[mkspec]
index = generatorCombo.findText(generatorText) index = generatorCombo.findText(generatorText)
...@@ -295,7 +294,7 @@ def __chooseTargets__(targets=Targets.DESKTOP_474_GCC, availableTargets=None, ...@@ -295,7 +294,7 @@ def __chooseTargets__(targets=Targets.DESKTOP_474_GCC, availableTargets=None,
Targets.EMBEDDED_LINUX, Targets.SIMULATOR, Targets.HARMATTAN] Targets.EMBEDDED_LINUX, Targets.SIMULATOR, Targets.HARMATTAN]
if platform.system() in ('Windows', 'Microsoft'): if platform.system() in ('Windows', 'Microsoft'):
available.remove(Targets.EMBEDDED_LINUX) available.remove(Targets.EMBEDDED_LINUX)
available.append(Targets.DESKTOP_474_MSVC2008) available.append(Targets.DESKTOP_480_MSVC2010)
if isMaddeDisabled: if isMaddeDisabled:
for target in filter(lambda x: x in available, for target in filter(lambda x: x in available,
(Targets.MAEMO5, Targets.HARMATTAN)): (Targets.MAEMO5, Targets.HARMATTAN)):
...@@ -486,7 +485,7 @@ def __getSupportedPlatforms__(text, getAsStrings=False): ...@@ -486,7 +485,7 @@ def __getSupportedPlatforms__(text, getAsStrings=False):
if platform.system() in ("Linux", "Darwin"): if platform.system() in ("Linux", "Darwin"):
result.append(Targets.EMBEDDED_LINUX) result.append(Targets.EMBEDDED_LINUX)
elif platform.system() in ('Windows', 'Microsoft'): elif platform.system() in ('Windows', 'Microsoft'):
result.append(Targets.DESKTOP_474_MSVC2008) result.append(Targets.DESKTOP_480_MSVC2010)
if 'MeeGo/Harmattan' in supports: if 'MeeGo/Harmattan' in supports:
result.append(Targets.HARMATTAN) result.append(Targets.HARMATTAN)
if 'Maemo/Fremantle' in supports: if 'Maemo/Fremantle' in supports:
...@@ -498,7 +497,7 @@ def __getSupportedPlatforms__(text, getAsStrings=False): ...@@ -498,7 +497,7 @@ def __getSupportedPlatforms__(text, getAsStrings=False):
result = [Targets.DESKTOP_474_GCC, Targets.DESKTOP_501_DEFAULT, Targets.MAEMO5, result = [Targets.DESKTOP_474_GCC, Targets.DESKTOP_501_DEFAULT, Targets.MAEMO5,
Targets.SIMULATOR, Targets.HARMATTAN] Targets.SIMULATOR, Targets.HARMATTAN]
if platform.system() in ('Windows', 'Microsoft'): if platform.system() in ('Windows', 'Microsoft'):
result.append(Targets.DESKTOP_474_MSVC2008) result.append(Targets.DESKTOP_480_MSVC2010)
else: else:
test.warning("Returning None (__getSupportedPlatforms__())", test.warning("Returning None (__getSupportedPlatforms__())",
"Parsed text: '%s'" % text) "Parsed text: '%s'" % text)
......
...@@ -48,7 +48,7 @@ def main(): ...@@ -48,7 +48,7 @@ def main():
return return
suitableKits = Targets.DESKTOP_474_GCC suitableKits = Targets.DESKTOP_474_GCC
if platform.system() in ('Windows', 'Microsoft'): if platform.system() in ('Windows', 'Microsoft'):
suitableKits |= Targets.DESKTOP_474_MSVC2008 suitableKits |= Targets.DESKTOP_480_MSVC2010
checkedTargets = openQmakeProject(SpeedCrunchPath, suitableKits) checkedTargets = openQmakeProject(SpeedCrunchPath, suitableKits)
progressBarWait(30000) progressBarWait(30000)
......
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