diff options
-rw-r--r-- | tests/auto/qml/bindingdependencyapi/dummy_imports.qml (renamed from tests/auto/qml/bindingdependencyapi/android_dummy_imports.qml) | 2 | ||||
-rw-r--r-- | tests/auto/qml/parserstress/dummy_imports.qml (renamed from tests/auto/qml/parserstress/android_dummy_imports.qml) | 2 | ||||
-rw-r--r-- | tests/auto/qml/qjsengine/dummy_imports.qml (renamed from tests/auto/qml/qjsvalue/android_dummy_imports.qml) | 2 | ||||
-rw-r--r-- | tests/auto/qml/qjsmanagedvalue/dummy_imports.qml (renamed from tests/auto/qml/qjsengine/android_dummy_imports.qml) | 2 | ||||
-rw-r--r-- | tests/auto/qml/qjsvalue/dummy_imports.qml (renamed from tests/auto/qml/qjsmanagedvalue/android_dummy_imports.qml) | 2 | ||||
-rw-r--r-- | tests/auto/qml/qmldiskcache/dummy_imports.qml (renamed from tests/auto/qml/qmldiskcache/android_dummy_imports.qml) | 2 | ||||
-rw-r--r-- | tests/auto/qml/qqmlpropertymap/dummy_imports.qml (renamed from tests/auto/qml/qqmlpropertymap/android_dummy_imports.qml) | 2 | ||||
-rw-r--r-- | tests/auto/qml/qqmlsqldatabase/android_dummy_imports.qml | 7 | ||||
-rw-r--r-- | tests/auto/qml/qqmlsqldatabase/dummy_imports.qml | 7 | ||||
-rw-r--r-- | tests/auto/qml/qqmltimer/dummy_imports.qml (renamed from tests/auto/qml/qqmltimer/android_dummy_imports.qml) | 2 | ||||
-rw-r--r-- | tests/auto/qml/qqmltypeloader/dummy_imports.qml (renamed from tests/auto/qml/qqmltypeloader/android_dummy_imports.qml) | 2 | ||||
-rw-r--r-- | tests/auto/quickcontrols2/controls/basic/dummy_imports.qml (renamed from tests/auto/quickcontrols2/controls/imagine/android_dummy_imports.qml) | 2 | ||||
-rw-r--r-- | tests/auto/quickcontrols2/controls/fusion/dummy_imports.qml (renamed from tests/auto/quickcontrols2/controls/material/android_dummy_imports.qml) | 2 | ||||
-rw-r--r-- | tests/auto/quickcontrols2/controls/imagine/dummy_imports.qml (renamed from tests/auto/quickcontrols2/controls/basic/android_dummy_imports.qml) | 2 | ||||
-rw-r--r-- | tests/auto/quickcontrols2/controls/material/dummy_imports.qml (renamed from tests/auto/quickcontrols2/controls/fusion/android_dummy_imports.qml) | 2 | ||||
-rw-r--r-- | tests/auto/quickcontrols2/controls/universal/android_dummy_imports.qml | 12 | ||||
-rw-r--r-- | tests/auto/quickcontrols2/controls/universal/dummy_imports.qml | 12 | ||||
-rw-r--r-- | tests/auto/quickcontrols2/customization/dummy_imports.qml (renamed from tests/auto/quickcontrols2/customization/android_dummy_imports.qml) | 2 | ||||
-rw-r--r-- | tests/auto/quickcontrols2/designer/dummy_imports.qml (renamed from tests/auto/quickcontrols2/designer/android_dummy_imports.qml) | 2 | ||||
-rw-r--r-- | tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/dummy_imports.qml (renamed from tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/android_dummy_imports.qml) | 2 | ||||
-rw-r--r-- | tests/auto/quickdialogs/qquickfiledialogimpl/dummy_imports.qml (renamed from tests/auto/quickdialogs/qquickfiledialogimpl/android_dummy_imports.qml) | 2 | ||||
-rw-r--r-- | tests/auto/quickdialogs/qquickfolderdialogimpl/dummy_imports.qml (renamed from tests/auto/quickdialogs/qquickfolderdialogimpl/android_dummy_imports.qml) | 2 | ||||
-rw-r--r-- | tests/auto/quickdialogs/qquickfontdialogimpl/dummy_imports.qml (renamed from tests/auto/quickdialogs/qquickfontdialogimpl/android_dummy_imports.qml) | 2 | ||||
-rw-r--r-- | tests/auto/quickdialogs/qquickmessagedialogimpl/dummy_imports.qml (renamed from tests/auto/quickdialogs/qquickmessagedialogimpl/android_dummy_imports.qml) | 2 |
24 files changed, 39 insertions, 39 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 diff --git a/tests/auto/quickcontrols2/controls/imagine/android_dummy_imports.qml b/tests/auto/quickcontrols2/controls/basic/dummy_imports.qml index 677b86d0c8..580db56d12 100644 --- a/tests/auto/quickcontrols2/controls/imagine/android_dummy_imports.qml +++ b/tests/auto/quickcontrols2/controls/basic/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/quickcontrols2/controls/material/android_dummy_imports.qml b/tests/auto/quickcontrols2/controls/fusion/dummy_imports.qml index 677b86d0c8..580db56d12 100644 --- a/tests/auto/quickcontrols2/controls/material/android_dummy_imports.qml +++ b/tests/auto/quickcontrols2/controls/fusion/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/quickcontrols2/controls/basic/android_dummy_imports.qml b/tests/auto/quickcontrols2/controls/imagine/dummy_imports.qml index 677b86d0c8..580db56d12 100644 --- a/tests/auto/quickcontrols2/controls/basic/android_dummy_imports.qml +++ b/tests/auto/quickcontrols2/controls/imagine/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/quickcontrols2/controls/fusion/android_dummy_imports.qml b/tests/auto/quickcontrols2/controls/material/dummy_imports.qml index 677b86d0c8..580db56d12 100644 --- a/tests/auto/quickcontrols2/controls/fusion/android_dummy_imports.qml +++ b/tests/auto/quickcontrols2/controls/material/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/quickcontrols2/controls/universal/android_dummy_imports.qml b/tests/auto/quickcontrols2/controls/universal/android_dummy_imports.qml deleted file mode 100644 index 677b86d0c8..0000000000 --- a/tests/auto/quickcontrols2/controls/universal/android_dummy_imports.qml +++ /dev/null @@ -1,12 +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 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_imports.qml b/tests/auto/quickcontrols2/controls/universal/dummy_imports.qml new file mode 100644 index 0000000000..580db56d12 --- /dev/null +++ b/tests/auto/quickcontrols2/controls/universal/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. +// 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/customization/android_dummy_imports.qml b/tests/auto/quickcontrols2/customization/dummy_imports.qml index d895cb0222..40d9cea712 100644 --- a/tests/auto/quickcontrols2/customization/android_dummy_imports.qml +++ b/tests/auto/quickcontrols2/customization/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/quickcontrols2/designer/android_dummy_imports.qml b/tests/auto/quickcontrols2/designer/dummy_imports.qml index 431e72a8a3..401692e570 100644 --- a/tests/auto/quickcontrols2/designer/android_dummy_imports.qml +++ b/tests/auto/quickcontrols2/designer/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/quickcontrols2/styleimportscompiletimeqmlonly/android_dummy_imports.qml b/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/dummy_imports.qml index 02e63135a2..aa37fd14b0 100644 --- a/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/android_dummy_imports.qml +++ b/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/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/quickdialogs/qquickfiledialogimpl/android_dummy_imports.qml b/tests/auto/quickdialogs/qquickfiledialogimpl/dummy_imports.qml index eb8d8918c6..4ea33de671 100644 --- a/tests/auto/quickdialogs/qquickfiledialogimpl/android_dummy_imports.qml +++ b/tests/auto/quickdialogs/qquickfiledialogimpl/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.Controls diff --git a/tests/auto/quickdialogs/qquickfolderdialogimpl/android_dummy_imports.qml b/tests/auto/quickdialogs/qquickfolderdialogimpl/dummy_imports.qml index 5b8c13eb13..7faa9b98e0 100644 --- a/tests/auto/quickdialogs/qquickfolderdialogimpl/android_dummy_imports.qml +++ b/tests/auto/quickdialogs/qquickfolderdialogimpl/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/quickdialogs/qquickfontdialogimpl/android_dummy_imports.qml b/tests/auto/quickdialogs/qquickfontdialogimpl/dummy_imports.qml index c437e9d720..5b8af918ea 100644 --- a/tests/auto/quickdialogs/qquickfontdialogimpl/android_dummy_imports.qml +++ b/tests/auto/quickdialogs/qquickfontdialogimpl/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/quickdialogs/qquickmessagedialogimpl/android_dummy_imports.qml b/tests/auto/quickdialogs/qquickmessagedialogimpl/dummy_imports.qml index c437e9d720..5b8af918ea 100644 --- a/tests/auto/quickdialogs/qquickmessagedialogimpl/android_dummy_imports.qml +++ b/tests/auto/quickdialogs/qquickmessagedialogimpl/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 |