Squish: QmlProjectManager is re-enabled by default

Change-Id: I91e12547843053c5de5ab5bd1af88977e937f80e
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
This commit is contained in:
Christian Stenger
2015-07-03 07:33:18 +02:00
parent b78e3e7ff5
commit 9cb59772dc
4 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -295,7 +295,7 @@ def createNewQtQuickUI(workingDir, qtVersion = "5.3", withControls = False):
template = 'Qt Quick Controls UI'
else:
template = 'Qt Quick UI'
__createProjectOrFileSelectType__(" Application", template)
__createProjectOrFileSelectType__(" Other Project", template)
if workingDir == None:
workingDir = tempDir()
projectName = __createProjectSetNameAndPath__(workingDir)
@@ -123,7 +123,7 @@ def main():
return
qmlProjFile = os.path.join(qmlProjDir, projName)
# start Creator by passing a .qmlproject file
startApplication('qtcreator -load QmlProjectManager' + SettingsPath + ' "%s"' % qmlProjFile)
startApplication('qtcreator' + SettingsPath + ' "%s"' % qmlProjFile)
if not startedWithoutPluginError():
return
@@ -45,7 +45,7 @@ def main():
return
qmlProjFile = os.path.join(qmlProjDir, projName)
# start Creator by passing a .qmlproject file
startApplication('qtcreator -load QmlProjectManager' + SettingsPath + ' "%s"' % qmlProjFile)
startApplication('qtcreator' + SettingsPath + ' "%s"' % qmlProjFile)
if not startedWithoutPluginError():
return
waitFor('object.exists(":Qt Creator_Utils::NavigationTreeView")', 10000)
@@ -31,7 +31,7 @@
source("../../shared/qtcreator.py")
def main():
startApplication("qtcreator -load QmlProjectManager" + SettingsPath)
startApplication("qtcreator" + SettingsPath)
if not startedWithoutPluginError():
return
available = [("5.3", False), ("5.3", True)]