11 files changed, 16 insertions, 16 deletions
diff --git a/tests/auto/qml/bindingdependencyapi/android_dummy_imports.qml b/tests/auto/qml/bindingdependencyapi/dummy_imports.qml
index 573ab4e934..63d33cbea6 100644
--- a/tests/auto/qml/bindingdependencyapi/android_dummy_imports.qml
+++ b/tests/auto/qml/bindingdependencyapi/dummy_imports.qml
@@ -1,5 +1,5 @@
 // This file exists for the sole purpose for qmlimportscanner to find
-// which modules it needs to extract for deployment on Android.
+// which modules it needs to extract for deployment.
 // Otherwise, it fails to find the imports that are expressed in C++.
 
 import QtQuick
diff --git a/tests/auto/qml/parserstress/android_dummy_imports.qml b/tests/auto/qml/parserstress/dummy_imports.qml
index 573ab4e934..63d33cbea6 100644
--- a/tests/auto/qml/parserstress/android_dummy_imports.qml
+++ b/tests/auto/qml/parserstress/dummy_imports.qml
@@ -1,5 +1,5 @@
 // This file exists for the sole purpose for qmlimportscanner to find
-// which modules it needs to extract for deployment on Android.
+// which modules it needs to extract for deployment.
 // Otherwise, it fails to find the imports that are expressed in C++.
 
 import QtQuick
diff --git a/tests/auto/qml/qjsvalue/android_dummy_imports.qml b/tests/auto/qml/qjsengine/dummy_imports.qml
index 2b1e932048..afe2b33adf 100644
--- a/tests/auto/qml/qjsvalue/android_dummy_imports.qml
+++ b/tests/auto/qml/qjsengine/dummy_imports.qml
@@ -1,5 +1,5 @@
 // This file exists for the sole purpose for qmlimportscanner to find
-// which modules it needs to extract for deployment on Android.
+// which modules it needs to extract for deployment.
 // Otherwise, it fails to find the imports that are expressed in C++.
 
 import QtQml
diff --git a/tests/auto/qml/qjsengine/android_dummy_imports.qml b/tests/auto/qml/qjsmanagedvalue/dummy_imports.qml
index 2b1e932048..afe2b33adf 100644
--- a/tests/auto/qml/qjsengine/android_dummy_imports.qml
+++ b/tests/auto/qml/qjsmanagedvalue/dummy_imports.qml
@@ -1,5 +1,5 @@
 // This file exists for the sole purpose for qmlimportscanner to find
-// which modules it needs to extract for deployment on Android.
+// which modules it needs to extract for deployment.
 // Otherwise, it fails to find the imports that are expressed in C++.
 
 import QtQml
diff --git a/tests/auto/qml/qjsmanagedvalue/android_dummy_imports.qml b/tests/auto/qml/qjsvalue/dummy_imports.qml
index 2b1e932048..afe2b33adf 100644
--- a/tests/auto/qml/qjsmanagedvalue/android_dummy_imports.qml
+++ b/tests/auto/qml/qjsvalue/dummy_imports.qml
@@ -1,5 +1,5 @@
 // This file exists for the sole purpose for qmlimportscanner to find
-// which modules it needs to extract for deployment on Android.
+// which modules it needs to extract for deployment.
 // Otherwise, it fails to find the imports that are expressed in C++.
 
 import QtQml
diff --git a/tests/auto/qml/qmldiskcache/android_dummy_imports.qml b/tests/auto/qml/qmldiskcache/dummy_imports.qml
index 573ab4e934..63d33cbea6 100644
--- a/tests/auto/qml/qmldiskcache/android_dummy_imports.qml
+++ b/tests/auto/qml/qmldiskcache/dummy_imports.qml
@@ -1,5 +1,5 @@
 // This file exists for the sole purpose for qmlimportscanner to find
-// which modules it needs to extract for deployment on Android.
+// which modules it needs to extract for deployment.
 // Otherwise, it fails to find the imports that are expressed in C++.
 
 import QtQuick
diff --git a/tests/auto/qml/qqmlpropertymap/android_dummy_imports.qml b/tests/auto/qml/qqmlpropertymap/dummy_imports.qml
index 573ab4e934..63d33cbea6 100644
--- a/tests/auto/qml/qqmlpropertymap/android_dummy_imports.qml
+++ b/tests/auto/qml/qqmlpropertymap/dummy_imports.qml
@@ -1,5 +1,5 @@
 // This file exists for the sole purpose for qmlimportscanner to find
-// which modules it needs to extract for deployment on Android.
+// which modules it needs to extract for deployment.
 // Otherwise, it fails to find the imports that are expressed in C++.
 
 import QtQuick
diff --git a/tests/auto/qml/qqmlsqldatabase/android_dummy_imports.qml b/tests/auto/qml/qqmlsqldatabase/android_dummy_imports.qml
deleted file mode 100644
index 573ab4e934..0000000000
--- a/tests/auto/qml/qqmlsqldatabase/android_dummy_imports.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-// 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
new file mode 100644
index 0000000000..63d33cbea6
--- /dev/null
+++ b/tests/auto/qml/qqmlsqldatabase/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.
+// Otherwise, it fails to find the imports that are expressed in C++.
+
+import QtQuick
+
+QtObject { }
diff --git a/tests/auto/qml/qqmltimer/android_dummy_imports.qml b/tests/auto/qml/qqmltimer/dummy_imports.qml
index 696c139fd5..e189da6689 100644
--- a/tests/auto/qml/qqmltimer/android_dummy_imports.qml
+++ b/tests/auto/qml/qqmltimer/dummy_imports.qml
@@ -1,5 +1,5 @@
 // This file exists for the sole purpose for qmlimportscanner to find
-// which modules it needs to extract for deployment on Android.
+// which modules it needs to extract for deployment.
 // Otherwise, it fails to find the imports that are expressed in C++.
 
 import QtQml
diff --git a/tests/auto/qml/qqmltypeloader/android_dummy_imports.qml b/tests/auto/qml/qqmltypeloader/dummy_imports.qml
index 696c139fd5..e189da6689 100644
--- a/tests/auto/qml/qqmltypeloader/android_dummy_imports.qml
+++ b/tests/auto/qml/qqmltypeloader/dummy_imports.qml
@@ -1,5 +1,5 @@
 // This file exists for the sole purpose for qmlimportscanner to find
-// which modules it needs to extract for deployment on Android.
+// which modules it needs to extract for deployment.
 // Otherwise, it fails to find the imports that are expressed in C++.
 
 import QtQml