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>

42 files changed, 184 insertions, 148 deletions

diff --git a/tests/auto/qml/bindingdependencyapi/android_dummy_imports.qml b/tests/auto/qml/bindingdependencyapi/android_dummy_imports.qml
new file mode 100644
index 0000000000..573ab4e934
--- /dev/null
+++ b/tests/auto/qml/bindingdependencyapi/android_dummy_imports.qml
@@ -0,0 +1,7 @@
+// 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
+
+QtObject { }
diff --git a/tests/auto/qml/bindingdependencyapi/dummy_imports.qml b/tests/auto/qml/bindingdependencyapi/dummy_imports.qml
deleted file mode 100644
index b9a196e188..0000000000
--- a/tests/auto/qml/bindingdependencyapi/dummy_imports.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-// 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++
-// code in tst_parserstress.cpp
-
-import QtQuick 2.0
-
-QtObject { }    // This is needed in order to keep importscanner happy
diff --git a/tests/auto/qml/parserstress/android_dummy_imports.qml b/tests/auto/qml/parserstress/android_dummy_imports.qml
new file mode 100644
index 0000000000..573ab4e934
--- /dev/null
+++ b/tests/auto/qml/parserstress/android_dummy_imports.qml
@@ -0,0 +1,7 @@
+// 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
+
+QtObject { }
diff --git a/tests/auto/qml/parserstress/dummy_imports.qml b/tests/auto/qml/parserstress/dummy_imports.qml
deleted file mode 100644
index b9a196e188..0000000000
--- a/tests/auto/qml/parserstress/dummy_imports.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-// 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++
-// code in tst_parserstress.cpp
-
-import QtQuick 2.0
-
-QtObject { }    // This is needed in order to keep importscanner happy
diff --git a/tests/auto/qml/qjsvalue/dummy_imports.qml b/tests/auto/qml/qjsengine/android_dummy_imports.qml
index 1cc20b8aba..2b1e932048 100644
--- a/tests/auto/qml/qjsvalue/dummy_imports.qml
+++ b/tests/auto/qml/qjsengine/android_dummy_imports.qml
@@ -1,7 +1,7 @@
 // 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++
+// which modules it needs to extract for deployment on Android.
+// Otherwise, it fails to find the imports that are expressed in C++.
 
 import QtQml
 
-QtObject { }    // This is needed in order to keep importscanner happy
+QtObject { }
diff --git a/tests/auto/qml/qjsengine/dummy_imports.qml b/tests/auto/qml/qjsengine/dummy_imports.qml
deleted file mode 100644
index 8d86f3583b..0000000000
--- a/tests/auto/qml/qjsengine/dummy_imports.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-// 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++
-// code in tst_parserstress.cpp
-
-import QtQml 2.0
-
-QtObject { }    // This is needed in order to keep importscanner happy
diff --git a/tests/auto/qml/qjsmanagedvalue/dummy_imports.qml b/tests/auto/qml/qjsmanagedvalue/android_dummy_imports.qml
index 1cc20b8aba..2b1e932048 100644
--- a/tests/auto/qml/qjsmanagedvalue/dummy_imports.qml
+++ b/tests/auto/qml/qjsmanagedvalue/android_dummy_imports.qml
@@ -1,7 +1,7 @@
 // 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++
+// which modules it needs to extract for deployment on Android.
+// Otherwise, it fails to find the imports that are expressed in C++.
 
 import QtQml
 
-QtObject { }    // This is needed in order to keep importscanner happy
+QtObject { }
diff --git a/tests/auto/qml/qjsvalue/android_dummy_imports.qml b/tests/auto/qml/qjsvalue/android_dummy_imports.qml
new file mode 100644
index 0000000000..2b1e932048
--- /dev/null
+++ b/tests/auto/qml/qjsvalue/android_dummy_imports.qml
@@ -0,0 +1,7 @@
+// 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 QtQml
+
+QtObject { }
diff --git a/tests/auto/qml/qmldiskcache/android_dummy_imports.qml b/tests/auto/qml/qmldiskcache/android_dummy_imports.qml
new file mode 100644
index 0000000000..573ab4e934
--- /dev/null
+++ b/tests/auto/qml/qmldiskcache/android_dummy_imports.qml
@@ -0,0 +1,7 @@
+// 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
+
+QtObject { }
diff --git a/tests/auto/qml/qmldiskcache/dummy_imports.qml b/tests/auto/qml/qmldiskcache/dummy_imports.qml
deleted file mode 100644
index b9a196e188..0000000000
--- a/tests/auto/qml/qmldiskcache/dummy_imports.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-// 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++
-// code in tst_parserstress.cpp
-
-import QtQuick 2.0
-
-QtObject { }    // This is needed in order to keep importscanner happy
diff --git a/tests/auto/qml/qqmlpropertymap/android_dummy_imports.qml b/tests/auto/qml/qqmlpropertymap/android_dummy_imports.qml
new file mode 100644
index 0000000000..573ab4e934
--- /dev/null
+++ b/tests/auto/qml/qqmlpropertymap/android_dummy_imports.qml
@@ -0,0 +1,7 @@
+// 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
+
+QtObject { }
diff --git a/tests/auto/qml/qqmlpropertymap/dummy_imports.qml b/tests/auto/qml/qqmlpropertymap/dummy_imports.qml
deleted file mode 100644
index 4ae9d3f2cf..0000000000
--- a/tests/auto/qml/qqmlpropertymap/dummy_imports.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-// 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 the
-// C++ code belonging to the test.
-
-import QtQuick 2.0
-
-QtObject { }    // This is needed in order to keep importscanner happy
diff --git a/tests/auto/qml/qqmlsqldatabase/android_dummy_imports.qml b/tests/auto/qml/qqmlsqldatabase/android_dummy_imports.qml
new file mode 100644
index 0000000000..573ab4e934
--- /dev/null
+++ b/tests/auto/qml/qqmlsqldatabase/android_dummy_imports.qml
@@ -0,0 +1,7 @@
+// 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
+
+QtObject { }
diff --git a/tests/auto/qml/qqmlsqldatabase/dummy_imports.qml b/tests/auto/qml/qqmlsqldatabase/dummy_imports.qml
deleted file mode 100644
index 4ae9d3f2cf..0000000000
--- a/tests/auto/qml/qqmlsqldatabase/dummy_imports.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-// 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 the
-// C++ code belonging to the test.
-
-import QtQuick 2.0
-
-QtObject { }    // This is needed in order to keep importscanner happy
diff --git a/tests/auto/qml/qqmltimer/android_dummy_imports.qml b/tests/auto/qml/qqmltimer/android_dummy_imports.qml
new file mode 100644
index 0000000000..696c139fd5
--- /dev/null
+++ b/tests/auto/qml/qqmltimer/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 QtQml
+import QtQuick
+
+QtObject { }
diff --git a/tests/auto/qml/qqmltimer/dummy_imports.qml b/tests/auto/qml/qqmltimer/dummy_imports.qml
deleted file mode 100644
index f78e04d489..0000000000
--- a/tests/auto/qml/qqmltimer/dummy_imports.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-// 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 the
-// C++ code belonging to the test.
-
-import QtQml 2.0
-import QtQuick 2.0
-
-QtObject { }    // This is needed in order to keep importscanner happy
diff --git a/tests/auto/qml/qqmltypeloader/android_dummy_imports.qml b/tests/auto/qml/qqmltypeloader/android_dummy_imports.qml
new file mode 100644
index 0000000000..696c139fd5
--- /dev/null
+++ b/tests/auto/qml/qqmltypeloader/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 QtQml
+import QtQuick
+
+QtObject { }
diff --git a/tests/auto/qml/qqmltypeloader/dummy_imports.qml b/tests/auto/qml/qqmltypeloader/dummy_imports.qml
deleted file mode 100644
index a4684b2007..0000000000
--- a/tests/auto/qml/qqmltypeloader/dummy_imports.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-// 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 the
-// C++ code belonging to the test.
-
-import QtQml 2.0
-import QtQuick 2.6
-
-QtObject { }    // This is needed in order to keep importscanner happy
diff --git a/tests/auto/quickcontrols2/controls/basic/android_dummy_imports.qml b/tests/auto/quickcontrols2/controls/basic/android_dummy_imports.qml
new file mode 100644
index 0000000000..677b86d0c8
--- /dev/null
+++ b/tests/auto/quickcontrols2/controls/basic/android_dummy_imports.qml
@@ -0,0 +1,12 @@
+// 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 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/basic/dummy.qml b/tests/auto/quickcontrols2/controls/basic/dummy.qml
deleted file mode 100644
index 6b1bdfec0e..0000000000
--- a/tests/auto/quickcontrols2/controls/basic/dummy.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-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/fusion/android_dummy_imports.qml b/tests/auto/quickcontrols2/controls/fusion/android_dummy_imports.qml
new file mode 100644
index 0000000000..677b86d0c8
--- /dev/null
+++ b/tests/auto/quickcontrols2/controls/fusion/android_dummy_imports.qml
@@ -0,0 +1,12 @@
+// 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 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/fusion/dummy.qml b/tests/auto/quickcontrols2/controls/fusion/dummy.qml
deleted file mode 100644
index 6b1bdfec0e..0000000000
--- a/tests/auto/quickcontrols2/controls/fusion/dummy.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-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/android_dummy_imports.qml b/tests/auto/quickcontrols2/controls/imagine/android_dummy_imports.qml
new file mode 100644
index 0000000000..677b86d0c8
--- /dev/null
+++ b/tests/auto/quickcontrols2/controls/imagine/android_dummy_imports.qml
@@ -0,0 +1,12 @@
+// 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 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/dummy.qml b/tests/auto/quickcontrols2/controls/imagine/dummy.qml
deleted file mode 100644
index 6b1bdfec0e..0000000000
--- a/tests/auto/quickcontrols2/controls/imagine/dummy.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-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/android_dummy_imports.qml b/tests/auto/quickcontrols2/controls/material/android_dummy_imports.qml
new file mode 100644
index 0000000000..677b86d0c8
--- /dev/null
+++ b/tests/auto/quickcontrols2/controls/material/android_dummy_imports.qml
@@ -0,0 +1,12 @@
+// 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 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/dummy.qml b/tests/auto/quickcontrols2/controls/material/dummy.qml
deleted file mode 100644
index 6b1bdfec0e..0000000000
--- a/tests/auto/quickcontrols2/controls/material/dummy.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-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/android_dummy_imports.qml b/tests/auto/quickcontrols2/controls/universal/android_dummy_imports.qml
new file mode 100644
index 0000000000..677b86d0c8
--- /dev/null
+++ b/tests/auto/quickcontrols2/controls/universal/android_dummy_imports.qml
@@ -0,0 +1,12 @@
+// 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 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/dummy.qml b/tests/auto/quickcontrols2/controls/universal/dummy.qml
deleted file mode 100644
index 6b1bdfec0e..0000000000
--- a/tests/auto/quickcontrols2/controls/universal/dummy.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-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/customization/android_dummy_imports.qml b/tests/auto/quickcontrols2/customization/android_dummy_imports.qml
new file mode 100644
index 0000000000..d895cb0222
--- /dev/null
+++ b/tests/auto/quickcontrols2/customization/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
+import QtQuick.Window
+import QtQuick.Controls
+
+QtObject { }
diff --git a/tests/auto/quickcontrols2/customization/dummy.qml b/tests/auto/quickcontrols2/customization/dummy.qml
deleted file mode 100644
index 138b24f6e2..0000000000
--- a/tests/auto/quickcontrols2/customization/dummy.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import QtQuick
-import QtQuick.Window
-import QtQuick.Controls
-
-QtObject {}
diff --git a/tests/auto/quickcontrols2/designer/android_dummy_imports.qml b/tests/auto/quickcontrols2/designer/android_dummy_imports.qml
new file mode 100644
index 0000000000..431e72a8a3
--- /dev/null
+++ b/tests/auto/quickcontrols2/designer/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.Controls
+
+QtObject { }
diff --git a/tests/auto/quickcontrols2/designer/dummy.qml b/tests/auto/quickcontrols2/designer/dummy.qml
deleted file mode 100644
index 002b8e5415..0000000000
--- a/tests/auto/quickcontrols2/designer/dummy.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-QtObject {}
diff --git a/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/android_dummy_imports.qml b/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/android_dummy_imports.qml
new file mode 100644
index 0000000000..02e63135a2
--- /dev/null
+++ b/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/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.Controls.Basic
+
+QtObject { }
diff --git a/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/dummy.qml b/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/dummy.qml
deleted file mode 100644
index 10c188956c..0000000000
--- a/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/dummy.qml
+++ /dev/null
@@ -1,3 +0,0 @@
-import QtQuick.Controls.Basic
-
-QtObject {}
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 {}