feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Squish: Added MSVC kit

Browse Source 
Change-Id: I79ae4e792fa2ed19d2580c4cd7de3669f22f08ed
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
Robert Loehning
2012-09-26 11:49:21 +02:00
parent f5f0d16362
commit b4d456657c
4 changed files with 49 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/system/settings/windows/Nokia/qtcreator/profiles.xml
+23 -2
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProfiles>
<!-- Written by Qt Creator 2.5.83, 2012-09-21T18:37:07. -->
<!-- Written by Qt Creator 2.5.83, 2012-09-25T18:19:53. -->
<qtcreator>
<data>
<variable>Profile.0</variable>
@@ -77,9 +77,30 @@
<value type="QString" key="PE.Profile.Name">Harmattan</value>
</valuemap>
</data>
<data>
<variable>Profile.4</variable>
<valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value>
<valuemap type="QVariantMap" key="PE.Profile.Data">
<valuemap type="QVariantMap" key="Debugger.Information">
<value type="QString" key="Binary">C:\Program Files\Debugging Tools for Windows (x64)\cdb.exe</value>
<value type="int" key="EngineType">4</value>
</valuemap>
<value type="QByteArray" key="PE.Profile.Device">Desktop Device</value>
<value type="QByteArray" key="PE.Profile.DeviceType">Desktop</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="QtPM4.mkSpecInformation"></value>
<value type="int" key="QtSupport.QtInformation">7</value>
</valuemap>
<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.Name">Desktop 474 MSVC2008</value>
</valuemap>
</data>
<data>
<variable>Profile.Count</variable>
<value type="int">4</value>
<value type="int">5</value>
</data>
<data>
<variable>Profile.Default</variable>
tests/system/settings/windows/Nokia/qtcreator/toolchains.xml
+12 -2
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorToolChains>
<!-- Written by Qt Creator 2.5.83, 2012-09-21T18:26:19. -->
<!-- Written by Qt Creator 2.5.83, 2012-09-25T18:19:53. -->
<qtcreator>
<data>
<variable>ToolChain.0</variable>
@@ -41,9 +41,19 @@
<value type="QString" key="ProjectExplorer.ToolChain.Id">ProjectExplorer.ToolChain.Gcc:{306bf3f1-a40e-49ca-9936-72af77d8ae6d}</value>
</valuemap>
</data>
<data>
<variable>ToolChain.3</variable>
<valuemap type="QVariantMap">
<value type="QString" key="ProjectExplorer.MsvcToolChain.SupportedAbi">x86-windows-msvc2008-pe-32bit</value>
<value type="QString" key="ProjectExplorer.MsvcToolChain.VarsBat">c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\vcvars32.bat</value>
<value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value>
<value type="QString" key="ProjectExplorer.ToolChain.DisplayName">MSVC 2008 (x86)</value>
<value type="QString" key="ProjectExplorer.ToolChain.Id">ProjectExplorer.ToolChain.Msvc:{b86e54dd-debd-409c-b4d7-1a5c710eaa37}</value>
</valuemap>
</data>
<data>
<variable>ToolChain.Count</variable>
<value type="int">3</value>
<value type="int">4</value>
</data>
<data>
<variable>Version</variable>
tests/system/shared/classes.py
+9 -3
View File
@@ -11,6 +11,7 @@ class QtQuickConstants:
MAEMO5 = 4
HARMATTAN = 8
EMBEDDED_LINUX = 16
DESKTOP_474_MSVC2008 = 32
@staticmethod
def getStringForComponents(components):
@@ -35,14 +36,19 @@ class QtQuickConstants:
return "Harmattan"
elif target==QtQuickConstants.Targets.EMBEDDED_LINUX:
return "Embedded Linux"
elif target==QtQuickConstants.Targets.DESKTOP_474_MSVC2008:
return "Desktop 474 MSVC2008"
else:
return None
@staticmethod
def getAllTargets():
return [QtQuickConstants.Targets.DESKTOP_474_GCC, QtQuickConstants.Targets.HARMATTAN,
QtQuickConstants.Targets.MAEMO5, QtQuickConstants.Targets.SIMULATOR,
QtQuickConstants.Targets.EMBEDDED_LINUX]
all = [QtQuickConstants.Targets.DESKTOP_474_GCC, QtQuickConstants.Targets.HARMATTAN,
QtQuickConstants.Targets.MAEMO5, QtQuickConstants.Targets.SIMULATOR,
QtQuickConstants.Targets.EMBEDDED_LINUX]
if platform.system() in ('Windows', 'Microsoft'):
all.append(QtQuickConstants.Targets.DESKTOP_474_MSVC2008)
return all
@staticmethod
def getAllTargetStrings():
tests/system/shared/project.py
+5
View File
@@ -276,6 +276,7 @@ def __chooseTargets__(targets=QtQuickConstants.Targets.DESKTOP_474_GCC, availabl
QtQuickConstants.Targets.SIMULATOR, QtQuickConstants.Targets.HARMATTAN]
if platform.system() in ('Windows', 'Microsoft'):
available.remove(QtQuickConstants.Targets.EMBEDDED_LINUX)
available.append(QtQuickConstants.Targets.DESKTOP_474_MSVC2008)
for current in available:
mustCheck = targets & current == current
try:
@@ -433,6 +434,8 @@ def __getSupportedPlatforms__(text, getAsStrings=False):
result.append(QtQuickConstants.Targets.DESKTOP_474_GCC)
if platform.system() in ("Linux", "Darwin"):
result.append(QtQuickConstants.Targets.EMBEDDED_LINUX)
elif platform.system() in ('Windows', 'Microsoft'):
result.append(QtQuickConstants.Targets.DESKTOP_474_MSVC2008)
if 'MeeGo/Harmattan' in supports:
result.append(QtQuickConstants.Targets.HARMATTAN)
addSimulator = True
@@ -444,6 +447,8 @@ def __getSupportedPlatforms__(text, getAsStrings=False):
elif 'Platform independent' in text:
result = [QtQuickConstants.Targets.DESKTOP_474_GCC, QtQuickConstants.Targets.MAEMO5,
QtQuickConstants.Targets.SIMULATOR, QtQuickConstants.Targets.HARMATTAN]
if platform.system() in ('Windows', 'Microsoft'):
result.append(QtQuickConstants.Targets.DESKTOP_474_MSVC2008)
else:
test.warning("Returning None (__getSupportedPlatforms__())",
"Parsed text: '%s'" % text)