feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Use fromUserInput on paths with potential native separators

Browse Source 
Otherwise functions like FilePath::fileName() don't work.

amends: 2d019ed659

Change-Id: Id606cabe77a46dab07d3f8c3f38e852517782176
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Alessandro Portale
2021-09-20 14:30:42 +02:00
parent 29df497d25
commit 58a9b1e396
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/android/androidbuildapkstep.cpp
View File

@@ -786,8 +786,9 @@ void AndroidBuildApkStep::doRun()
return true; // use the generated file if it was not generated by qtcreator return true; // use the generated file if it was not generated by qtcreator
BuildSystem *bs = buildSystem(); BuildSystem *bs = buildSystem();
const FilePaths targets = Utils::transform(bs->extraData(buildKey, Android::Constants::AndroidTargets).toStringList(), const FilePaths targets = Utils::transform(
&FilePath::fromString); bs->extraData(buildKey, Android::Constants::AndroidTargets).toStringList(),
&FilePath::fromUserInput);
if (targets.isEmpty()) if (targets.isEmpty())
return inputExists; // qmake does this job for us return inputExists; // qmake does this job for us