1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix path in Java QML component generation

Browse Source 
The parameter buildPath comes from QDir:absolutePath(), which gives a
path that starts with '/' or a drive speficiation. When calling
getImportPaths on a Windows machine the path becomes something like
"/C://dev/qt5/...". As a result, androiddeployqt exists with a failure.

On Linux/macOS systems this was not a problem because // = /

Change-Id: I85376253055549344f06c9da9ebd67364e429112
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 776982a14e53e8661c3508c3d05e0efe538bc67e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Olli Vuolteenaho 2024-06-06 15:43:44 +03:00 committed by Qt Cherry-pick Bot
parent 52bb40a088
commit 894c1d4a35
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/androiddeployqt/main.cpp
View File

@ -3419,7 +3419,7 @@ int generateJavaQmlComponents(const Options &options)
// For instance, it does not discover statically linked **inner** QML modules. // For instance, it does not discover statically linked **inner** QML modules.
const auto getImportPaths = [](const QString &buildPath, const QString &libName, const auto getImportPaths = [](const QString &buildPath, const QString &libName,
QStringList &appImports, QStringList &externalImports) -> bool { QStringList &appImports, QStringList &externalImports) -> bool {
QFile confRspFile("/%1/.qt/qml_imports/%2_conf.rsp"_L1.arg(buildPath, libName)); QFile confRspFile("%1/.qt/qml_imports/%2_conf.rsp"_L1.arg(buildPath, libName));
if (!confRspFile.exists() || !confRspFile.open(QFile::ReadOnly)) if (!confRspFile.exists() || !confRspFile.open(QFile::ReadOnly))
return false; return false;
QTextStream rspStream(&confRspFile); QTextStream rspStream(&confRspFile);