diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-06-09 13:13:49 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-06-10 21:10:34 +0200 |
| commit | 0c82f98ec5c0135f3789f0f9c5e30978698ddff9 (patch) | |
| tree | 6ab1a80625c0523b462a07cb1e7914c336ca65e3 /src/corelib/thread/qthread_win.cpp | |
| parent | b3d0325a8dca56d3163451a417edfe6015a4ffe0 (diff) | |
androiddeployqt: Only pass qt_install_dir/qml directory if it exists
In Conan's case, the qtbase installed package directory lacks a qml
directory. We pass that as a valid qml import path via CMake ->
deployment json file -> androiddeployqt -> qmlimportscanner
which causes the qmlimportscanner to fail with
qmlimportscanner: No such file or directory:
"~/package/some_sha_1/qml"
Invalid json output from qmlimportscanner.
which in turn fails the androiddeploqt build step.
Make sure to only pass qtbase_install_dir/qml if it actually exists.
Amends 4ef3da04c3390f02bcb0507128372e6a299dc8fd
Amends c08b9a49ba70b1cbb0704668dd3f2c487d7f585e
Pick-to: 6.2 6.3 6.4
Fixes: QTBUG-104056
Task-number: QTBUG-88519
Task-number: QTBUG-89588
Change-Id: I4310eb4e265ae8d3e3f09e1e1dbed79210e23de6
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/corelib/thread/qthread_win.cpp')
0 files changed, 0 insertions, 0 deletions