Fix path in Java QML component generation
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:
parent
52bb40a088
commit
894c1d4a35
@ -3419,7 +3419,7 @@ int generateJavaQmlComponents(const Options &options)
|
||||
// For instance, it does not discover statically linked **inner** QML modules.
|
||||
const auto getImportPaths = [](const QString &buildPath, const QString &libName,
|
||||
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))
|
||||
return false;
|
||||
QTextStream rspStream(&confRspFile);
|
||||
|
Loading…
x
Reference in New Issue
Block a user