mirror of
https://github.com/QuasarApp/CQtDeployer.git
synced 2025-05-10 08:29:35 +00:00
ref #600 "Hardcode qtQml module"
This commit is contained in:
parent
e68e42326c
commit
f61169c896
@ -88,6 +88,16 @@ bool QML::extractImportsFromDir(const QString &path, bool recursive) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// task https://github.com/QuasarApp/CQtDeployer/issues/600
|
||||||
|
// There are no import lines for the qt models module in Qt 6.1, but this module is required for all qml applications.
|
||||||
|
if (_qtVersion & QtMajorVersion::Qt6) {
|
||||||
|
auto importQtQml = "QtQml";
|
||||||
|
if (!_imports.contains(importQtQml)) {
|
||||||
|
_imports.insert(importQtQml);
|
||||||
|
extractImportsFromDir(getPathFromImport(importQtQml), recursive);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (recursive) {
|
if (recursive) {
|
||||||
for (const auto &info: dirs) {
|
for (const auto &info: dirs) {
|
||||||
extractImportsFromDir(info.absoluteFilePath(), recursive);
|
extractImportsFromDir(info.absoluteFilePath(), recursive);
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit f5a8f4de82f7318eeb6729cd25e53313951b5483
|
Subproject commit 553e337e6a956534d34dbbfcec42359117aa35d4
|
@ -1531,8 +1531,8 @@ void deploytest::testBinPrefix() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void deploytest::customTest() {
|
void deploytest::customTest() {
|
||||||
// runTestParams({"-confFile", "path",
|
runTestParams({"-confFile", "/home/andrei/Qt/Examples/Qt-6.1.0/quick3d/build-particles3d-Desktop_Qt_6_1_0_GCC_64bit-Release/CQtDeployer.json",
|
||||||
// "qifFromSystem"});
|
"qifFromSystem"});
|
||||||
}
|
}
|
||||||
|
|
||||||
void deploytest::testQmlExtrct() {
|
void deploytest::testQmlExtrct() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user