Commit ca4b3f9d authored by Robert Loehning's avatar Robert Loehning

Squish: Wait for parsing in createNewQtQuickApplication()

This is what createProject_Qt_GUI() and
createProject_Qt_Console() have always done

Change-Id: Iaead1767c699e4fd237d999e6f3d94d277b1d84f
Reviewed-by: default avatarChristian Stenger <christian.stenger@digia.com>
parent 0a5cc243
......@@ -225,6 +225,8 @@ def createNewQtQuickApplication(workingDir, projectName = None, templateFile = N
nextButton = waitForObject(":Next_QPushButton")
clickButton(nextButton)
__createProjectHandleLastPage__()
waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)", 10000)
return checkedTargets, projectName
def createNewQtQuickUI(workingDir):
......
......@@ -6,7 +6,6 @@ source("../shared/aptw.py")
def main():
startApplication("qtcreator" + SettingsPath)
checkedTargets, projectName = createNewQtQuickApplication(tempDir(), "SampleApp")
waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)")
# run project for debug and release and verify results
runVerify(checkedTargets)
#close Qt Creator
......
......@@ -7,7 +7,6 @@ def main():
# create qt quick application
# Step 1: Open test .pro project.
createNewQtQuickApplication(tempDir(), "SampleApp")
waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)")
# Step 2: Open .cpp file in Edit mode.
if not openDocument("SampleApp.Sources.main\\.cpp"):
test.fatal("Could not open main.cpp")
......
......@@ -7,7 +7,6 @@ def main():
# create qt quick application
# Step 1: Open test .pro project.
createNewQtQuickApplication(tempDir(), "SampleApp")
waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)")
# Step 2: Open .cpp file in Edit mode.
if not openDocument("SampleApp.Sources.main\\.cpp"):
test.fatal("Could not open main.cpp")
......
......@@ -28,10 +28,8 @@ def main():
startApplication("qtcreator" + SettingsPath)
# create qt quick application 1
createNewQtQuickApplication(tempDir(), projectName1)
waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)", 5000)
# create qt quick application 2
createNewQtQuickApplication(tempDir(), projectName2)
waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)", 5000)
# change to project 1
verifyChangeProject(projectName1)
# change to project 2
......
......@@ -15,9 +15,6 @@ def main():
# using a temporary directory won't mess up a potentially existing
workingDir = tempDir()
checkedTargets, projectName = createNewQtQuickApplication(workingDir)
# wait for parsing to complete
waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}",
"sourceFilesRefreshed(QStringList)")
editor = waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget")
if placeCursorToLine(editor, "MouseArea.*", True):
type(editor, '<Up>')
......
......@@ -13,12 +13,9 @@ def main():
# add docs to have the correct tool tips
addHelpDocumentationFromSDK()
templateDir = prepareTemplate(sourceExample)
prepareForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)")
installLazySignalHandler("{type='Core::FutureProgress' unnamed='1'}", "finished()", "__handleFutureProgress__")
# using a temporary directory won't mess up a potentially existing
createNewQtQuickApplication(tempDir(), "untitled", os.path.join(templateDir, qmlFile))
# wait for parsing to complete
waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)")
testRenameId()
testFindUsages()
testHovering()
......
......@@ -4,8 +4,6 @@ def main():
startApplication("qtcreator" + SettingsPath)
# using a temporary directory won't mess up a potentially exisiting
createNewQtQuickApplication(tempDir(), "untitled")
# wait for parsing to complete
waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)", 5000)
if not prepareQmlFile():
invokeMenuItem("File", "Save All")
invokeMenuItem("File", "Exit")
......
......@@ -6,8 +6,6 @@ def main():
workingDir = tempDir()
checkedTargets, projectName = createNewQtQuickApplication(workingDir,
targets = QtQuickConstants.Targets.DESKTOP_474_GCC)
# wait for parsing to complete
waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)")
test.log("Building project")
result = modifyRunSettingsForHookInto(projectName, len(checkedTargets), 11223)
invokeMenuItem("Build", "Build All")
......
......@@ -11,8 +11,6 @@ def main():
checkedTargets, projectName = createNewQtQuickApplication(workingDir, None,
os.path.join(prepareTemplate(sourceExample), qmlFile),
QtQuickConstants.Targets.DESKTOP_474_GCC)
# wait for parsing to complete
waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)")
test.log("Building project")
result = modifyRunSettingsForHookInto(projectName, len(checkedTargets), 11223)
invokeMenuItem("Build","Build All")
......
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