From 16f0d38d568b3af135f5db862f5868a6bc669c42 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Fri, 25 Feb 2022 11:50:01 +0200 Subject: [PATCH] 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 Reviewed-by: Mitch Curtis --- .../bindingdependencyapi/android_dummy_imports.qml | 7 +++++++ .../auto/qml/bindingdependencyapi/dummy_imports.qml | 8 -------- .../auto/qml/parserstress/android_dummy_imports.qml | 7 +++++++ tests/auto/qml/parserstress/dummy_imports.qml | 8 -------- .../android_dummy_imports.qml} | 6 +++--- tests/auto/qml/qjsengine/dummy_imports.qml | 8 -------- .../{dummy_imports.qml => android_dummy_imports.qml} | 6 +++--- tests/auto/qml/qjsvalue/android_dummy_imports.qml | 7 +++++++ .../auto/qml/qmldiskcache/android_dummy_imports.qml | 7 +++++++ tests/auto/qml/qmldiskcache/dummy_imports.qml | 8 -------- .../qml/qqmlpropertymap/android_dummy_imports.qml | 7 +++++++ tests/auto/qml/qqmlpropertymap/dummy_imports.qml | 8 -------- .../qml/qqmlsqldatabase/android_dummy_imports.qml | 7 +++++++ tests/auto/qml/qqmlsqldatabase/dummy_imports.qml | 8 -------- tests/auto/qml/qqmltimer/android_dummy_imports.qml | 8 ++++++++ tests/auto/qml/qqmltimer/dummy_imports.qml | 9 --------- .../qml/qqmltypeloader/android_dummy_imports.qml | 8 ++++++++ tests/auto/qml/qqmltypeloader/dummy_imports.qml | 9 --------- .../controls/basic/android_dummy_imports.qml | 12 ++++++++++++ tests/auto/quickcontrols2/controls/basic/dummy.qml | 9 --------- .../controls/fusion/android_dummy_imports.qml | 12 ++++++++++++ tests/auto/quickcontrols2/controls/fusion/dummy.qml | 9 --------- .../controls/imagine/android_dummy_imports.qml | 12 ++++++++++++ tests/auto/quickcontrols2/controls/imagine/dummy.qml | 9 --------- .../controls/material/android_dummy_imports.qml | 12 ++++++++++++ .../auto/quickcontrols2/controls/material/dummy.qml | 9 --------- .../controls/universal/android_dummy_imports.qml | 12 ++++++++++++ .../auto/quickcontrols2/controls/universal/dummy.qml | 9 --------- .../customization/android_dummy_imports.qml | 9 +++++++++ tests/auto/quickcontrols2/customization/dummy.qml | 5 ----- .../designer/android_dummy_imports.qml | 8 ++++++++ tests/auto/quickcontrols2/designer/dummy.qml | 4 ---- .../android_dummy_imports.qml | 8 ++++++++ .../styleimportscompiletimeqmlonly/dummy.qml | 3 --- .../qquickfiledialogimpl/android_dummy_imports.qml | 9 +++++++++ .../auto/quickdialogs/qquickfiledialogimpl/dummy.qml | 5 ----- .../qquickfolderdialogimpl/android_dummy_imports.qml | 10 ++++++++++ .../quickdialogs/qquickfolderdialogimpl/dummy.qml | 6 ------ .../qquickfontdialogimpl/android_dummy_imports.qml | 8 ++++++++ .../auto/quickdialogs/qquickfontdialogimpl/dummy.qml | 4 ---- .../android_dummy_imports.qml | 8 ++++++++ .../quickdialogs/qquickmessagedialogimpl/dummy.qml | 4 ---- 42 files changed, 184 insertions(+), 148 deletions(-) create mode 100644 tests/auto/qml/bindingdependencyapi/android_dummy_imports.qml delete mode 100644 tests/auto/qml/bindingdependencyapi/dummy_imports.qml create mode 100644 tests/auto/qml/parserstress/android_dummy_imports.qml delete mode 100644 tests/auto/qml/parserstress/dummy_imports.qml rename tests/auto/qml/{qjsvalue/dummy_imports.qml => qjsengine/android_dummy_imports.qml} (53%) delete mode 100644 tests/auto/qml/qjsengine/dummy_imports.qml rename tests/auto/qml/qjsmanagedvalue/{dummy_imports.qml => android_dummy_imports.qml} (53%) create mode 100644 tests/auto/qml/qjsvalue/android_dummy_imports.qml create mode 100644 tests/auto/qml/qmldiskcache/android_dummy_imports.qml delete mode 100644 tests/auto/qml/qmldiskcache/dummy_imports.qml create mode 100644 tests/auto/qml/qqmlpropertymap/android_dummy_imports.qml delete mode 100644 tests/auto/qml/qqmlpropertymap/dummy_imports.qml create mode 100644 tests/auto/qml/qqmlsqldatabase/android_dummy_imports.qml delete mode 100644 tests/auto/qml/qqmlsqldatabase/dummy_imports.qml create mode 100644 tests/auto/qml/qqmltimer/android_dummy_imports.qml delete mode 100644 tests/auto/qml/qqmltimer/dummy_imports.qml create mode 100644 tests/auto/qml/qqmltypeloader/android_dummy_imports.qml delete mode 100644 tests/auto/qml/qqmltypeloader/dummy_imports.qml create mode 100644 tests/auto/quickcontrols2/controls/basic/android_dummy_imports.qml delete mode 100644 tests/auto/quickcontrols2/controls/basic/dummy.qml create mode 100644 tests/auto/quickcontrols2/controls/fusion/android_dummy_imports.qml delete mode 100644 tests/auto/quickcontrols2/controls/fusion/dummy.qml create mode 100644 tests/auto/quickcontrols2/controls/imagine/android_dummy_imports.qml delete mode 100644 tests/auto/quickcontrols2/controls/imagine/dummy.qml create mode 100644 tests/auto/quickcontrols2/controls/material/android_dummy_imports.qml delete mode 100644 tests/auto/quickcontrols2/controls/material/dummy.qml create mode 100644 tests/auto/quickcontrols2/controls/universal/android_dummy_imports.qml delete mode 100644 tests/auto/quickcontrols2/controls/universal/dummy.qml create mode 100644 tests/auto/quickcontrols2/customization/android_dummy_imports.qml delete mode 100644 tests/auto/quickcontrols2/customization/dummy.qml create mode 100644 tests/auto/quickcontrols2/designer/android_dummy_imports.qml delete mode 100644 tests/auto/quickcontrols2/designer/dummy.qml create mode 100644 tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/android_dummy_imports.qml delete mode 100644 tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/dummy.qml create mode 100644 tests/auto/quickdialogs/qquickfiledialogimpl/android_dummy_imports.qml delete mode 100644 tests/auto/quickdialogs/qquickfiledialogimpl/dummy.qml create mode 100644 tests/auto/quickdialogs/qquickfolderdialogimpl/android_dummy_imports.qml delete mode 100644 tests/auto/quickdialogs/qquickfolderdialogimpl/dummy.qml create mode 100644 tests/auto/quickdialogs/qquickfontdialogimpl/android_dummy_imports.qml delete mode 100644 tests/auto/quickdialogs/qquickfontdialogimpl/dummy.qml create mode 100644 tests/auto/quickdialogs/qquickmessagedialogimpl/android_dummy_imports.qml delete mode 100644 tests/auto/quickdialogs/qquickmessagedialogimpl/dummy.qml 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 similarity index 53% rename from tests/auto/qml/qjsvalue/dummy_imports.qml rename to 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 similarity index 53% rename from tests/auto/qml/qjsmanagedvalue/dummy_imports.qml rename to 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 {}