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:
parent
6c3373109f
commit
16f0d38d56
|
@ -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 { }
|
|
@ -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
|
|
|
@ -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 { }
|
|
@ -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
|
|
|
@ -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 { }
|
|
@ -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
|
|
|
@ -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 { }
|
|
@ -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 { }
|
|
@ -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 { }
|
|
@ -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
|
|
|
@ -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 { }
|
|
@ -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
|
|
|
@ -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 { }
|
|
@ -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
|
|
|
@ -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 { }
|
|
@ -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
|
|
|
@ -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 { }
|
|
@ -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
|
|
|
@ -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 { }
|
|
@ -1,9 +0,0 @@
|
||||||
import QtQml
|
|
||||||
import QtQuick
|
|
||||||
import QtQuick.NativeStyle
|
|
||||||
import QtQuick.Layouts
|
|
||||||
import Qt.labs.settings
|
|
||||||
import Qt.labs.qmlmodels
|
|
||||||
|
|
||||||
QtObject {
|
|
||||||
}
|
|
|
@ -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 { }
|
|
@ -1,9 +0,0 @@
|
||||||
import QtQml
|
|
||||||
import QtQuick
|
|
||||||
import QtQuick.NativeStyle
|
|
||||||
import QtQuick.Layouts
|
|
||||||
import Qt.labs.settings
|
|
||||||
import Qt.labs.qmlmodels
|
|
||||||
|
|
||||||
QtObject {
|
|
||||||
}
|
|
|
@ -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 { }
|
|
@ -1,9 +0,0 @@
|
||||||
import QtQml
|
|
||||||
import QtQuick
|
|
||||||
import QtQuick.NativeStyle
|
|
||||||
import QtQuick.Layouts
|
|
||||||
import Qt.labs.settings
|
|
||||||
import Qt.labs.qmlmodels
|
|
||||||
|
|
||||||
QtObject {
|
|
||||||
}
|
|
|
@ -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 { }
|
|
@ -1,9 +0,0 @@
|
||||||
import QtQml
|
|
||||||
import QtQuick
|
|
||||||
import QtQuick.NativeStyle
|
|
||||||
import QtQuick.Layouts
|
|
||||||
import Qt.labs.settings
|
|
||||||
import Qt.labs.qmlmodels
|
|
||||||
|
|
||||||
QtObject {
|
|
||||||
}
|
|
|
@ -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 { }
|
|
@ -1,9 +0,0 @@
|
||||||
import QtQml
|
|
||||||
import QtQuick
|
|
||||||
import QtQuick.NativeStyle
|
|
||||||
import QtQuick.Layouts
|
|
||||||
import Qt.labs.settings
|
|
||||||
import Qt.labs.qmlmodels
|
|
||||||
|
|
||||||
QtObject {
|
|
||||||
}
|
|
|
@ -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 { }
|
|
@ -1,5 +0,0 @@
|
||||||
import QtQuick
|
|
||||||
import QtQuick.Window
|
|
||||||
import QtQuick.Controls
|
|
||||||
|
|
||||||
QtObject {}
|
|
|
@ -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 { }
|
|
@ -1,4 +0,0 @@
|
||||||
import QtQuick
|
|
||||||
import QtQuick.Controls
|
|
||||||
|
|
||||||
QtObject {}
|
|
|
@ -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 { }
|
|
@ -1,3 +0,0 @@
|
||||||
import QtQuick.Controls.Basic
|
|
||||||
|
|
||||||
QtObject {}
|
|
|
@ -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 { }
|
|
@ -1,5 +0,0 @@
|
||||||
import QtQuick.Controls
|
|
||||||
import QtQuick.Layouts
|
|
||||||
import Qt.labs.folderlistmodel
|
|
||||||
|
|
||||||
QtObject {}
|
|
|
@ -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 { }
|
|
@ -1,6 +0,0 @@
|
||||||
import QtQuick
|
|
||||||
import QtQuick.Controls
|
|
||||||
import QtQuick.Layouts
|
|
||||||
import Qt.labs.folderlistmodel
|
|
||||||
|
|
||||||
QtObject {}
|
|
|
@ -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 { }
|
|
@ -1,4 +0,0 @@
|
||||||
import QtQuick
|
|
||||||
import QtQuick.Layouts
|
|
||||||
|
|
||||||
QtObject {}
|
|
|
@ -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 { }
|
|
@ -1,4 +0,0 @@
|
||||||
import QtQuick
|
|
||||||
import QtQuick.Layouts
|
|
||||||
|
|
||||||
QtObject {}
|
|
Loading…
Reference in New Issue