From 58a9b1e396d2cb9157fb238e10a9ee01900bb501 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Mon, 20 Sep 2021 14:30:42 +0200 Subject: [PATCH] Android: Use fromUserInput on paths with potential native separators Otherwise functions like FilePath::fileName() don't work. amends: 2d019ed659ed31ff3324725ead3b54e7d12db5e7 Change-Id: Id606cabe77a46dab07d3f8c3f38e852517782176 Reviewed-by: Assam Boudjelthia --- src/plugins/android/androidbuildapkstep.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp index ca6c072f909..4c47418c851 100644 --- a/src/plugins/android/androidbuildapkstep.cpp +++ b/src/plugins/android/androidbuildapkstep.cpp @@ -786,8 +786,9 @@ void AndroidBuildApkStep::doRun() return true; // use the generated file if it was not generated by qtcreator BuildSystem *bs = buildSystem(); - const FilePaths targets = Utils::transform(bs->extraData(buildKey, Android::Constants::AndroidTargets).toStringList(), - &FilePath::fromString); + const FilePaths targets = Utils::transform( + bs->extraData(buildKey, Android::Constants::AndroidTargets).toStringList(), + &FilePath::fromUserInput); if (targets.isEmpty()) return inputExists; // qmake does this job for us