diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2022-05-17 18:15:56 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2022-05-18 11:08:22 +0300 |
| commit | 96a4fffc72ff2416609191427dd2857170d0bf49 (patch) | |
| tree | d9de39ab9dde0c6faef0c9a684808442401a66dc | |
| parent | 0a6843cf183dc2d05811dc8fb28b82f0a1891d97 (diff) | |
| download | qtwebchannel-96a4fffc72ff2416609191427dd2857170d0bf49.tar.gz | |
Move qml test data to correct location
The qml test data in CMakeLists.txt is expected to be
under data folder but the qml files are put directly
under the test project root dir and thus they're not
packaged.
Pick-to: 6.2 6.3
Task-number: QTBUG-88846
Change-Id: Ib9eb022d95c193aafc3718902e1aed9dd8d743f8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
| -rw-r--r-- | tests/auto/qml/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/qml/data/Client.qml (renamed from tests/auto/qml/Client.qml) | 0 | ||||
| -rw-r--r-- | tests/auto/qml/data/tst_bench.qml (renamed from tests/auto/qml/tst_bench.qml) | 0 | ||||
| -rw-r--r-- | tests/auto/qml/data/tst_multiclient.qml (renamed from tests/auto/qml/tst_multiclient.qml) | 0 | ||||
| -rw-r--r-- | tests/auto/qml/data/tst_webchannel.qml (renamed from tests/auto/qml/tst_webchannel.qml) | 0 | ||||
| -rw-r--r-- | tests/auto/qml/data/tst_webchannelseparation.qml (renamed from tests/auto/qml/tst_webchannelseparation.qml) | 0 |
6 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qml/CMakeLists.txt b/tests/auto/qml/CMakeLists.txt index d4b3613..cf8975d 100644 --- a/tests/auto/qml/CMakeLists.txt +++ b/tests/auto/qml/CMakeLists.txt @@ -14,7 +14,7 @@ qt_internal_add_test(tst_qmlwebchannel # special case QMLTEST QML_IMPORTPATH "${CMAKE_CURRENT_BINARY_DIR}/../../../qml" - "${CMAKE_CURRENT_SOURCE_DIR}" + "${CMAKE_CURRENT_SOURCE_DIR}/data" SOURCES qml.cpp testobject.cpp testobject.h diff --git a/tests/auto/qml/Client.qml b/tests/auto/qml/data/Client.qml index 9543818..9543818 100644 --- a/tests/auto/qml/Client.qml +++ b/tests/auto/qml/data/Client.qml diff --git a/tests/auto/qml/tst_bench.qml b/tests/auto/qml/data/tst_bench.qml index b8ac0df..b8ac0df 100644 --- a/tests/auto/qml/tst_bench.qml +++ b/tests/auto/qml/data/tst_bench.qml diff --git a/tests/auto/qml/tst_multiclient.qml b/tests/auto/qml/data/tst_multiclient.qml index c175c59..c175c59 100644 --- a/tests/auto/qml/tst_multiclient.qml +++ b/tests/auto/qml/data/tst_multiclient.qml diff --git a/tests/auto/qml/tst_webchannel.qml b/tests/auto/qml/data/tst_webchannel.qml index fe62542..fe62542 100644 --- a/tests/auto/qml/tst_webchannel.qml +++ b/tests/auto/qml/data/tst_webchannel.qml diff --git a/tests/auto/qml/tst_webchannelseparation.qml b/tests/auto/qml/data/tst_webchannelseparation.qml index a0632b3..a0632b3 100644 --- a/tests/auto/qml/tst_webchannelseparation.qml +++ b/tests/auto/qml/data/tst_webchannelseparation.qml |