diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2021-01-12 15:38:52 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2021-01-12 16:31:22 +0200 |
| commit | 26d8fb0f1e199745fcc3daa84502fece11ab77ac (patch) | |
| tree | 037abafbd8b6c90f28077b78909c86c5e75fb7f8 /tests/manual | |
| parent | ec60bbb65c3f19382c5398e6f33e8f372ca0bbf2 (diff) | |
Fix manual tests for Qt 6
Added missing Qt::Quick library to CMakeLists.txt in manual tests that
were missing it.
Also fixed the Loader use in qmlchartproperties manual test.
Change-Id: Ib2fe70c0ba755feb73dfbcfe6b80984d620182c0
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'tests/manual')
| -rw-r--r-- | tests/manual/qmlchartaxis/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/manual/qmlchartproperties/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/manual/qmlchartproperties/qml/qmlchartproperties/main.qml | 6 |
3 files changed, 6 insertions, 2 deletions
diff --git a/tests/manual/qmlchartaxis/CMakeLists.txt b/tests/manual/qmlchartaxis/CMakeLists.txt index 21a040b7..2aef246e 100644 --- a/tests/manual/qmlchartaxis/CMakeLists.txt +++ b/tests/manual/qmlchartaxis/CMakeLists.txt @@ -13,6 +13,7 @@ qt_internal_add_manual_test(qmlchartaxis Qt::Gui Qt::OpenGL Qt::OpenGLWidgets + Qt::Quick ) # Resources: diff --git a/tests/manual/qmlchartproperties/CMakeLists.txt b/tests/manual/qmlchartproperties/CMakeLists.txt index 998d94bb..f60f6f08 100644 --- a/tests/manual/qmlchartproperties/CMakeLists.txt +++ b/tests/manual/qmlchartproperties/CMakeLists.txt @@ -13,6 +13,7 @@ qt_internal_add_manual_test(qmlchartproperties Qt::Gui Qt::OpenGL Qt::OpenGLWidgets + Qt::Quick ) # Resources: diff --git a/tests/manual/qmlchartproperties/qml/qmlchartproperties/main.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/main.qml index a8862854..6f6c29db 100644 --- a/tests/manual/qmlchartproperties/qml/qmlchartproperties/main.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/main.qml @@ -55,9 +55,10 @@ Rectangle { width: main.width - editorLoader.width height: parent.height source: "Chart.qml" + asynchronous: true onStatusChanged: { if (status == Loader.Ready && editorLoader.status == Loader.Ready && chartLoader.item) { - if (source.toString().search("/Chart.qml") > 0) + if (source.toString() === "Chart.qml") editorLoader.item.chart = chartLoader.item.chart; else editorLoader.item.series = chartLoader.item.series; @@ -70,9 +71,10 @@ Rectangle { width: 280 height: parent.height source: "ChartEditor.qml" + asynchronous: true onStatusChanged: { if (status == Loader.Ready && chartLoader.status == Loader.Ready && chartLoader.item) { - if (source.toString().search("/ChartEditor.qml") > 0) + if (source.toString() === "ChartEditor.qml") editorLoader.item.chart = chartLoader.item.chart; else editorLoader.item.series = chartLoader.item.series; |