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

Squish: Updated opening of CMake projects

Browse Source 
Change-Id: Iad89199052fe8df090eb5a6257dd88de51a15a07
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
Robert Loehning
2013-01-24 16:18:32 +01:00
parent 128df0f4b4
commit 31b135a4b1
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/system/shared/project.py
View File

@@ -45,17 +45,18 @@ def openCmakeProject(projectPath, buildDir):
mkspec = __getMkspecFromQmake__("qmake") mkspec = __getMkspecFromQmake__("qmake")
test.log("Using mkspec '%s'" % mkspec) test.log("Using mkspec '%s'" % mkspec)
generatorText = "Unix Generator (Desktop 474 GCC)"
if "win32-" in mkspec: if "win32-" in mkspec:
generatorName = {"win32-g++" : "MinGW Generator (MinGW from SDK)", generatorName = {"win32-g++" : "MinGW Generator (Desktop 474 GCC)",
"win32-msvc2008" : "NMake Generator (Microsoft Visual C++ Compiler 9.0 (x86))", "win32-msvc2008" : "NMake Generator (Desktop 474 MSVC2008)",
"win32-msvc2010" : "NMake Generator (Microsoft Visual C++ Compiler 10.0 (x86))"} "win32-msvc2010" : "NMake Generator (Desktop 474 MSVC2010)"}
index = -1
if mkspec in generatorName: if mkspec in generatorName:
index = generatorCombo.findText(generatorName[mkspec]) generatorText = generatorName[mkspec]
if index == -1: index = generatorCombo.findText(generatorText)
test.warning("No matching CMake generator for mkspec '%s' found." % mkspec) if index == -1:
else: test.warning("No matching CMake generator for mkspec '%s' found." % mkspec)
generatorCombo.setCurrentIndex(index) else:
generatorCombo.setCurrentIndex(index)
clickButton(waitForObject(":CMake Wizard.Run CMake_QPushButton")) clickButton(waitForObject(":CMake Wizard.Run CMake_QPushButton"))
try: try: