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>
This commit is contained in:
Assam Boudjelthia 2022-02-25 11:50:01 +02:00
parent 6c3373109f
commit 16f0d38d56
42 changed files with 184 additions and 148 deletions

View File

@ -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 { }

View File

@ -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

View File

@ -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 { }

View File

@ -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

View File

@ -1,7 +1,7 @@
// This file exists for the sole purpose for qmlimportscanner to find // This file exists for the sole purpose for qmlimportscanner to find
// which modules it needs to extract for deployment. // which modules it needs to extract for deployment on Android.
// Otherwise, it fails to find the imports that are expressed in C++ // Otherwise, it fails to find the imports that are expressed in C++.
import QtQml import QtQml
QtObject { } // This is needed in order to keep importscanner happy QtObject { }

View File

@ -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

View File

@ -1,7 +1,7 @@
// This file exists for the sole purpose for qmlimportscanner to find // This file exists for the sole purpose for qmlimportscanner to find
// which modules it needs to extract for deployment. // which modules it needs to extract for deployment on Android.
// Otherwise, it fails to find the imports that are expressed in C++ // Otherwise, it fails to find the imports that are expressed in C++.
import QtQml import QtQml
QtObject { } // This is needed in order to keep importscanner happy QtObject { }

View File

@ -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 { }

View File

@ -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 { }

View File

@ -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

View File

@ -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 { }

View File

@ -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

View File

@ -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 { }

View File

@ -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

View File

@ -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 { }

View File

@ -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

View File

@ -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 { }

View File

@ -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

View File

@ -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 { }

View File

@ -1,9 +0,0 @@
import QtQml
import QtQuick
import QtQuick.NativeStyle
import QtQuick.Layouts
import Qt.labs.settings
import Qt.labs.qmlmodels
QtObject {
}

View File

@ -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 { }

View File

@ -1,9 +0,0 @@
import QtQml
import QtQuick
import QtQuick.NativeStyle
import QtQuick.Layouts
import Qt.labs.settings
import Qt.labs.qmlmodels
QtObject {
}

View File

@ -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 { }

View File

@ -1,9 +0,0 @@
import QtQml
import QtQuick
import QtQuick.NativeStyle
import QtQuick.Layouts
import Qt.labs.settings
import Qt.labs.qmlmodels
QtObject {
}

View File

@ -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 { }

View File

@ -1,9 +0,0 @@
import QtQml
import QtQuick
import QtQuick.NativeStyle
import QtQuick.Layouts
import Qt.labs.settings
import Qt.labs.qmlmodels
QtObject {
}

View File

@ -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 { }

View File

@ -1,9 +0,0 @@
import QtQml
import QtQuick
import QtQuick.NativeStyle
import QtQuick.Layouts
import Qt.labs.settings
import Qt.labs.qmlmodels
QtObject {
}

View File

@ -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 { }

View File

@ -1,5 +0,0 @@
import QtQuick
import QtQuick.Window
import QtQuick.Controls
QtObject {}

View File

@ -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 { }

View File

@ -1,4 +0,0 @@
import QtQuick
import QtQuick.Controls
QtObject {}

View File

@ -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 { }

View File

@ -1,3 +0,0 @@
import QtQuick.Controls.Basic
QtObject {}

View File

@ -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 { }

View File

@ -1,5 +0,0 @@
import QtQuick.Controls
import QtQuick.Layouts
import Qt.labs.folderlistmodel
QtObject {}

View File

@ -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 { }

View File

@ -1,6 +0,0 @@
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import Qt.labs.folderlistmodel
QtObject {}

View File

@ -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 { }

View File

@ -1,4 +0,0 @@
import QtQuick
import QtQuick.Layouts
QtObject {}

View File

@ -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 { }

View File

@ -1,4 +0,0 @@
import QtQuick
import QtQuick.Layouts
QtObject {}