QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-04-27 10:14:32 +00:00
Code Issues Projects Releases Wiki Activity

use old method of parsin qml of qt5

Browse Source
This commit is contained in:
Andrei Yankovich 2022-10-26 23:50:04 +03:00
parent d61172c64a
commit 7ed0ca69ca
1 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/Deploy/src/extracter.cpp
View File

@ -448,6 +448,8 @@ bool Extracter::extractQml() {
QStringList plugins;
QStringList listItems;
auto QtVersion = cnf->isNeededQt(i.key());
const auto qmlInputList = distro.qmlInput();
for (const auto &qmlInput: qmlInputList) {
QFileInfo info(qmlInput);
@ -465,7 +467,6 @@ bool Extracter::extractQml() {
continue;
}
auto QtVersion = cnf->isNeededQt(i.key());
QSharedPointer<iQML> qmlScaner;
if (QtVersion & QtMajorVersion::Qt6) {
qmlScaner = QSharedPointer<QMLQt6>::create(cnf->qtDir.getQmls());
@ -481,25 +482,36 @@ bool Extracter::extractQml() {
}
QStringList toCopyQmlFiles;
for (const auto& plugin: qAsConst(plugins)) {
const auto qmlFiles = QDir(plugin).entryInfoList(QDir::Files);
for (const auto& qmlFile: qmlFiles) {
toCopyQmlFiles.push_back(qmlFile.absoluteFilePath());
if (QtVersion & QtMajorVersion::Qt5) {
// See the https://github.com/QuasarApp/CQtDeployer/issues/728 issue
// use old method of parse qml for qt5
if (!_fileManager->copyFolder(cnf->qtDir.getQmls(),
targetPath + distro.getQmlOutDir(),
DeployCore::debugExtensions() ,
&listItems)) {
return false;
}
} else {
for (const auto& plugin: qAsConst(plugins)) {
const auto qmlFiles = QDir(plugin).entryInfoList(QDir::Files);
for (const auto& qmlFile: qmlFiles) {
toCopyQmlFiles.push_back(qmlFile.absoluteFilePath());
}
}
// This function works very slow because use list mask
// solution: use the QSet and restriction comparese of the pathes for the mask argument.
// to-do optimise this function
if (!_fileManager->copyFolder(cnf->qtDir.getQmls(),
targetPath + distro.getQmlOutDir(),
DeployCore::debugExtensions() ,
&listItems,
&toCopyQmlFiles)) {
return false;
}
}
// This function works very slow because use list mask
// solution: use the QSet and restriction comparese of the pathes for the mask argument.
// to-do optimise this function
if (!_fileManager->copyFolder(cnf->qtDir.getQmls(),
targetPath + distro.getQmlOutDir(),
DeployCore::debugExtensions() ,
&listItems,
&toCopyQmlFiles)) {
return false;
}
for (const auto &item : qAsConst(listItems)) {
extractPluginLib(item, i.key());