QMake: Use FilePath::resolvePath to resolve files

Works with remote files, too.

Change-Id: I90244e456633aec1c2a750b4be3c707efeede42c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-07-14 12:22:42 +02:00
parent cb96b1f89b
commit 4a08edf78d

View File

@@ -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();