diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2022-01-24 16:46:42 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-02-09 12:18:28 +0000 |
| commit | 07882ef56477a1cb1825569f7a2b56611770924d (patch) | |
| tree | 6694151242a16c48ccc8a80386b6a7196fee15f9 | |
| parent | cabd9e6292d316f111788d2f6d85589e30763d2d (diff) | |
Fix tst_controls missing resources
bundle all data resources and make sure all imports and bundled.
Add dummy.qml files which are needed for androiddeployqt to be able
to package the QML modules because they're not imported in a normal
fashion under a QML file but rather implicitly inside the test cases.
Task-numer: QTBUG-97056
Change-Id: I8be72c06994cc7bd90fb176a19bf69142b225fd1
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit b6413335b0a977e5c7218c4d74fb090fa11bf52e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
8 files changed, 40 insertions, 4 deletions
diff --git a/tests/auto/quickcontrols2/controls/fusion/CMakeLists.txt b/tests/auto/quickcontrols2/controls/fusion/CMakeLists.txt index 96d4fa5a85..633e0442de 100644 --- a/tests/auto/quickcontrols2/controls/fusion/CMakeLists.txt +++ b/tests/auto/quickcontrols2/controls/fusion/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/../data/tst_*) + ${CMAKE_CURRENT_SOURCE_DIR}/../data/*) list(APPEND test_data ${test_data_glob}) qt_internal_add_test(tst_fusion diff --git a/tests/auto/quickcontrols2/controls/fusion/dummy.qml b/tests/auto/quickcontrols2/controls/fusion/dummy.qml new file mode 100644 index 0000000000..6b1bdfec0e --- /dev/null +++ b/tests/auto/quickcontrols2/controls/fusion/dummy.qml @@ -0,0 +1,9 @@ +import QtQml +import QtQuick +import QtQuick.NativeStyle +import QtQuick.Layouts +import Qt.labs.settings +import Qt.labs.qmlmodels + +QtObject { +} diff --git a/tests/auto/quickcontrols2/controls/imagine/CMakeLists.txt b/tests/auto/quickcontrols2/controls/imagine/CMakeLists.txt index be47d59d0b..9638eb8250 100644 --- a/tests/auto/quickcontrols2/controls/imagine/CMakeLists.txt +++ b/tests/auto/quickcontrols2/controls/imagine/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/../data/tst_*) + ${CMAKE_CURRENT_SOURCE_DIR}/../data/*) list(APPEND test_data ${test_data_glob}) qt_internal_add_test(tst_imagine diff --git a/tests/auto/quickcontrols2/controls/imagine/dummy.qml b/tests/auto/quickcontrols2/controls/imagine/dummy.qml new file mode 100644 index 0000000000..6b1bdfec0e --- /dev/null +++ b/tests/auto/quickcontrols2/controls/imagine/dummy.qml @@ -0,0 +1,9 @@ +import QtQml +import QtQuick +import QtQuick.NativeStyle +import QtQuick.Layouts +import Qt.labs.settings +import Qt.labs.qmlmodels + +QtObject { +} diff --git a/tests/auto/quickcontrols2/controls/material/CMakeLists.txt b/tests/auto/quickcontrols2/controls/material/CMakeLists.txt index 7aa6c25dfc..8cc0cd3fab 100644 --- a/tests/auto/quickcontrols2/controls/material/CMakeLists.txt +++ b/tests/auto/quickcontrols2/controls/material/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/../data/tst_*) + ${CMAKE_CURRENT_SOURCE_DIR}/../data/*) list(APPEND test_data ${test_data_glob}) qt_internal_add_test(tst_material diff --git a/tests/auto/quickcontrols2/controls/material/dummy.qml b/tests/auto/quickcontrols2/controls/material/dummy.qml new file mode 100644 index 0000000000..6b1bdfec0e --- /dev/null +++ b/tests/auto/quickcontrols2/controls/material/dummy.qml @@ -0,0 +1,9 @@ +import QtQml +import QtQuick +import QtQuick.NativeStyle +import QtQuick.Layouts +import Qt.labs.settings +import Qt.labs.qmlmodels + +QtObject { +} diff --git a/tests/auto/quickcontrols2/controls/universal/CMakeLists.txt b/tests/auto/quickcontrols2/controls/universal/CMakeLists.txt index c009750e90..2faa30cc37 100644 --- a/tests/auto/quickcontrols2/controls/universal/CMakeLists.txt +++ b/tests/auto/quickcontrols2/controls/universal/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/../data/tst_*) + ${CMAKE_CURRENT_SOURCE_DIR}/../data/*) list(APPEND test_data ${test_data_glob}) qt_internal_add_test(tst_universal diff --git a/tests/auto/quickcontrols2/controls/universal/dummy.qml b/tests/auto/quickcontrols2/controls/universal/dummy.qml new file mode 100644 index 0000000000..6b1bdfec0e --- /dev/null +++ b/tests/auto/quickcontrols2/controls/universal/dummy.qml @@ -0,0 +1,9 @@ +import QtQml +import QtQuick +import QtQuick.NativeStyle +import QtQuick.Layouts +import Qt.labs.settings +import Qt.labs.qmlmodels + +QtObject { +} |