diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2023-01-24 17:00:51 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2023-01-25 17:08:36 +0000 |
| commit | aa551eebb5c276b0ee80a9b77b45715789e6f41a (patch) | |
| tree | f050a55f8ed1d0f41a0234b7d61940d5a774a502 /tests/auto | |
| parent | bb8a8872e341f64a87e09bef64d33a753273102c (diff) | |
tst_qmlcppcodegen: Add QML dependency for Android
qmlimportscanner is rather limited in how it works,
and does not pick up the Qt.labs.folderlistmodel
dependency for Dialogs.
Pick-to: 6.5
Fixes: QTBUG-103044
Change-Id: I778f5c8981f1a2603bc3a5d2fd249a83de6c9bd8
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/auto/qml/qmlcppcodegen/data/dummy_imports.qml | 8 | ||||
| -rw-r--r-- | tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt b/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt index be74e062c0..34865cb43c 100644 --- a/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt +++ b/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt @@ -197,6 +197,7 @@ set(qml_files variantlist.qml versionmismatch.qml voidfunction.qml + dummy_imports.qml ) set(resource_files diff --git a/tests/auto/qml/qmlcppcodegen/data/dummy_imports.qml b/tests/auto/qml/qmlcppcodegen/data/dummy_imports.qml new file mode 100644 index 0000000000..4917baae7f --- /dev/null +++ b/tests/auto/qml/qmlcppcodegen/data/dummy_imports.qml @@ -0,0 +1,8 @@ +// This file exists for the sole purpose for qmlimportscanner to find +// which modules it needs to extract for deployment. +// Otherwise, it fails to find the imports that are expressed in C++. + +import QtQml +import Qt.labs.folderlistmodel // workaround, shouldn't we get that from Dialogs? + +QtObject { } diff --git a/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp b/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp index 97d0d0e58a..bd11d613e5 100644 --- a/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp +++ b/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp @@ -1447,10 +1447,6 @@ void tst_QmlCppCodegen::noQQmlData() void tst_QmlCppCodegen::scopeObjectDestruction() { -#ifdef Q_OS_ANDROID - QSKIP("crashes on Android, see QTBUG-103044."); -#endif - QQmlEngine engine; QQmlComponent component(&engine, QUrl(u"qrc:/qt/qml/TestTypes/fileDialog.qml"_s)); |