From 4a08edf78dd7ef79c7fb598ab3b1b9ef751c3f92 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 14 Jul 2021 12:22:42 +0200
Subject: [PATCH] QMake: Use FilePath::resolvePath to resolve files

Works with remote files, too.

Change-Id: I90244e456633aec1c2a750b4be3c707efeede42c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/qmakeprojectmanager/qmakenodes.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp
index 5063d88ae74..da1f89f4eee 100644
--- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp
@@ -377,11 +377,9 @@ QVariant QmakeProFileNode::data(Utils::Id role) const
     if (role == Android::Constants::AndroidSoLibPath) {
         TargetInformation info = targetInformation();
         QStringList res = {info.buildDir.toString()};
-        Utils::FilePath destDir = info.destDir;
+        FilePath destDir = info.destDir;
         if (!destDir.isEmpty()) {
-            if (destDir.toFileInfo().isRelative())
-                destDir = Utils::FilePath::fromString(QDir::cleanPath(info.buildDir.toString()
-                                                                      + '/' + destDir.toString()));
+            destDir = info.buildDir.resolvePath(destDir.path());
             res.append(destDir.toString());
         }
         res.removeDuplicates();