diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2016-05-30 07:22:38 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2016-05-30 12:35:39 +0000 |
| commit | 0e331a2e2946385d2a86fcf2d13027a8e4003484 (patch) | |
| tree | e772766510abd3f12c52e71ba742892bd12e7164 | |
| parent | 8405a16179e8a3d95841dce0cfbd0b8480dfd48b (diff) | |
| download | qt-creator-0e331a2e2946385d2a86fcf2d13027a8e4003484.tar.gz | |
Squish: Adapt to changes in Quick Application template
The template has slightly changed in 6b506b34ec68315021dc80d6e0f595580586c98d.
Change-Id: Id58e67beacaac046c6dd235b715f360dc7ef4c09
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
| -rw-r--r-- | tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.tsv | 22 | ||||
| -rw-r--r-- | tests/system/suite_debugger/tst_simple_debug/test.py | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.tsv b/tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.tsv index 3cc221462a..b7422391d5 100644 --- a/tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.tsv +++ b/tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.tsv @@ -1,15 +1,15 @@ "0" "1" "6" "11" "<program>" "" "1" "Main Program" "main.qml:4" "Create" "2" "QtQuick.Window/Window" -"main.qml:12" "Signal" "2" "onTriggered: { runCount += 1; var i; for (i = 1; i < 2500; ++i) { var j = i * i; console.log(j); } }" -"main.qml:12" "JavaScript" "2" "onTriggered" -"main.qml:30" "Create" "2" "QtQuick/Text" +"main.qml:15" "Signal" "2" "onTriggered: { runCount += 1; var i; for (i = 1; i < 2500; ++i) { var j = i * i; console.log(j); } }" +"main.qml:15" "JavaScript" "2" "onTriggered" +"main.qml:33" "Create" "2" "QtQuick/Text" "main.qml:1" "Compile" "1" "main.qml" -"main.qml:7" "Create" "2" "QtQuick/Timer" -"main.qml:32" "Binding" "1" "anchors.centerIn: parent" -"main.qml:23" "Create" "2" "QtQuick/MouseArea" -"main.qml:11" "Binding" "3" "running: runCount < 2" -"main.qml:32" "JavaScript" "1" "expression for centerIn" -"main.qml:24" "Binding" "1" "anchors.fill: parent" -"main.qml:11" "JavaScript" "3" "expression for running" -"main.qml:24" "JavaScript" "1" "expression for fill" +"main.qml:10" "Create" "2" "QtQuick/Timer" +"main.qml:35" "Binding" "1" "anchors.centerIn: parent" +"main.qml:26" "Create" "2" "QtQuick/MouseArea" +"main.qml:14" "Binding" "3" "running: runCount < 2" +"main.qml:35" "JavaScript" "1" "expression for centerIn" +"main.qml:27" "Binding" "1" "anchors.fill: parent" +"main.qml:14" "JavaScript" "3" "expression for running" +"main.qml:27" "JavaScript" "1" "expression for fill" diff --git a/tests/system/suite_debugger/tst_simple_debug/test.py b/tests/system/suite_debugger/tst_simple_debug/test.py index 205ef99cfc..43f1e72099 100644 --- a/tests/system/suite_debugger/tst_simple_debug/test.py +++ b/tests/system/suite_debugger/tst_simple_debug/test.py @@ -51,7 +51,7 @@ def main(): result = setBreakpointsForCurrentProject(filesAndLines) if result: expectedBreakpointsOrder = [{os.path.join(workingDir, projectName, "main.cpp"):8}, - {os.path.join(workingDir, projectName, "main.qml"):10}] + {os.path.join(workingDir, projectName, "main.qml"):13}] # Only use 4.7.4 to work around QTBUG-25187 availableConfigs = iterateBuildConfigs(len(checkedTargets), "Debug") progressBarWait() |