forked from qt-creator/qt-creator
Squish: Fix Qt Quick 1 related tests
qrc files are now used in Qt Quick 1 template as well. Change-Id: I7b7541d16100285893587605bb1b4130277b72e4 Reviewed-by: Robert Loehning <robert.loehning@digia.com>
This commit is contained in:
@@ -37,7 +37,7 @@ def startQtCreatorWithNewAppAtQMLEditor(projectDir, projectName, line = None):
|
||||
# create qt quick application
|
||||
createNewQtQuickApplication(projectDir, projectName)
|
||||
# open qml file
|
||||
qmlFile = projectName + ".QML.qml.main\\.qml"
|
||||
qmlFile = projectName + ".Resources.qml\.qrc./.qml/main\\.qml"
|
||||
if not openDocument(qmlFile):
|
||||
test.fatal("Could not open %s" % qmlFile)
|
||||
invokeMenuItem("File", "Exit")
|
||||
|
||||
@@ -38,7 +38,7 @@ def main():
|
||||
# create qt quick application
|
||||
createNewQtQuickApplication(tempDir(), "SampleApp")
|
||||
# create syntax error in qml file
|
||||
openDocument("SampleApp.QML.qml.main\\.qml")
|
||||
openDocument("SampleApp.Resources.qml\.qrc./.qml/main\\.qml")
|
||||
if not appendToLine(waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget"), "Text {", "SyntaxError"):
|
||||
invokeMenuItem("File", "Exit")
|
||||
return
|
||||
|
||||
@@ -48,7 +48,7 @@ def main():
|
||||
'onTriggered: console.log("Break here")'])
|
||||
invokeMenuItem("File", "Save All")
|
||||
filesAndLines = [
|
||||
{ "%s.QML.qml.main\\.qml" % projectName : 'onTriggered.*' },
|
||||
{ "%s.Resources.qml\.qrc./.qml/main\\.qml" % projectName : 'onTriggered.*' },
|
||||
{ "%s.Sources.main\\.cpp" % projectName : "viewer.setOrientation\\(.+\\);" }
|
||||
]
|
||||
test.log("Setting breakpoints")
|
||||
|
||||
@@ -45,7 +45,7 @@ def main():
|
||||
invokeMenuItem("File", "Exit")
|
||||
|
||||
def prepareQmlFile():
|
||||
if not openDocument("untitled.QML.qml.main\\.qml"):
|
||||
if not openDocument("untitled.Resources.qml\.qrc./.qml/main\\.qml"):
|
||||
test.fatal("Could not open main.qml")
|
||||
return None
|
||||
editor = waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget")
|
||||
|
||||
Reference in New Issue
Block a user