diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2022-02-25 11:50:01 +0200 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2022-03-02 15:21:09 +0200 |
| commit | 16f0d38d568b3af135f5db862f5868a6bc669c42 (patch) | |
| tree | 8d0b7d92309dc07f519515617b32d88abecfacfd /tests/auto/quickdialogs | |
| parent | 6c3373109fedf45b06c9c48355a80922fd754b31 (diff) | |
Android: unify the android tests dummy import files
This renames all qml files added before to allow qmlimportsanner to
include the necessary modules into Android packages, into
android_dummy_imports.qml, and also adds a comment in each one
describing why it's needed.
Pick-to: 6.2 6.3
Task-number: QTBUG-97056
Change-Id: I7fc0514dd9e5bc10849fdd0503547e1a75242414
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests/auto/quickdialogs')
8 files changed, 35 insertions, 19 deletions
diff --git a/tests/auto/quickdialogs/qquickfiledialogimpl/android_dummy_imports.qml b/tests/auto/quickdialogs/qquickfiledialogimpl/android_dummy_imports.qml new file mode 100644 index 0000000000..eb8d8918c6 --- /dev/null +++ b/tests/auto/quickdialogs/qquickfiledialogimpl/android_dummy_imports.qml @@ -0,0 +1,9 @@ +// This file exists for the sole purpose for qmlimportscanner to find +// which modules it needs to extract for deployment on Android. +// Otherwise, it fails to find the imports that are expressed in C++. + +import QtQuick.Controls +import QtQuick.Layouts +import Qt.labs.folderlistmodel + +QtObject { } diff --git a/tests/auto/quickdialogs/qquickfiledialogimpl/dummy.qml b/tests/auto/quickdialogs/qquickfiledialogimpl/dummy.qml deleted file mode 100644 index cffae81fbd..0000000000 --- a/tests/auto/quickdialogs/qquickfiledialogimpl/dummy.qml +++ /dev/null @@ -1,5 +0,0 @@ -import QtQuick.Controls -import QtQuick.Layouts -import Qt.labs.folderlistmodel - -QtObject {} diff --git a/tests/auto/quickdialogs/qquickfolderdialogimpl/android_dummy_imports.qml b/tests/auto/quickdialogs/qquickfolderdialogimpl/android_dummy_imports.qml new file mode 100644 index 0000000000..5b8c13eb13 --- /dev/null +++ b/tests/auto/quickdialogs/qquickfolderdialogimpl/android_dummy_imports.qml @@ -0,0 +1,10 @@ +// This file exists for the sole purpose for qmlimportscanner to find +// which modules it needs to extract for deployment on Android. +// Otherwise, it fails to find the imports that are expressed in C++. + +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import Qt.labs.folderlistmodel + +QtObject { } diff --git a/tests/auto/quickdialogs/qquickfolderdialogimpl/dummy.qml b/tests/auto/quickdialogs/qquickfolderdialogimpl/dummy.qml deleted file mode 100644 index d5bb0b6bb5..0000000000 --- a/tests/auto/quickdialogs/qquickfolderdialogimpl/dummy.qml +++ /dev/null @@ -1,6 +0,0 @@ -import QtQuick -import QtQuick.Controls -import QtQuick.Layouts -import Qt.labs.folderlistmodel - -QtObject {} diff --git a/tests/auto/quickdialogs/qquickfontdialogimpl/android_dummy_imports.qml b/tests/auto/quickdialogs/qquickfontdialogimpl/android_dummy_imports.qml new file mode 100644 index 0000000000..c437e9d720 --- /dev/null +++ b/tests/auto/quickdialogs/qquickfontdialogimpl/android_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 on Android. +// Otherwise, it fails to find the imports that are expressed in C++. + +import QtQuick +import QtQuick.Layouts + +QtObject { } diff --git a/tests/auto/quickdialogs/qquickfontdialogimpl/dummy.qml b/tests/auto/quickdialogs/qquickfontdialogimpl/dummy.qml deleted file mode 100644 index f7df04e6fc..0000000000 --- a/tests/auto/quickdialogs/qquickfontdialogimpl/dummy.qml +++ /dev/null @@ -1,4 +0,0 @@ -import QtQuick -import QtQuick.Layouts - -QtObject {} diff --git a/tests/auto/quickdialogs/qquickmessagedialogimpl/android_dummy_imports.qml b/tests/auto/quickdialogs/qquickmessagedialogimpl/android_dummy_imports.qml new file mode 100644 index 0000000000..c437e9d720 --- /dev/null +++ b/tests/auto/quickdialogs/qquickmessagedialogimpl/android_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 on Android. +// Otherwise, it fails to find the imports that are expressed in C++. + +import QtQuick +import QtQuick.Layouts + +QtObject { } diff --git a/tests/auto/quickdialogs/qquickmessagedialogimpl/dummy.qml b/tests/auto/quickdialogs/qquickmessagedialogimpl/dummy.qml deleted file mode 100644 index f7df04e6fc..0000000000 --- a/tests/auto/quickdialogs/qquickmessagedialogimpl/dummy.qml +++ /dev/null @@ -1,4 +0,0 @@ -import QtQuick -import QtQuick.Layouts - -QtObject {} |