From f7d022009ba4ef00c93d6cb159edd4c058216e45 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 29 Nov 2022 10:47:42 +0100
Subject: [PATCH] QMake: Use FilePath for sysroot

Less roundtrips.

Change-Id: I0f98629398170f5d1d4ccd60cfaa0d54f8e2b9f3
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp | 2 +-
 src/plugins/qmakeprojectmanager/qmakeparsernodes.h   | 5 +----
 src/plugins/qmakeprojectmanager/qmakeproject.cpp     | 4 ++--
 src/plugins/qmakeprojectmanager/qmakeproject.h       | 4 ++--
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
index dfee2040b68..21eac9bd98d 100644
--- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
@@ -1301,7 +1301,7 @@ QmakeEvalInput QmakeProFile::evalInput() const
     input.projectDir = directoryPath().toFSPathString();
     input.projectFilePath = filePath();
     input.buildDirectory = m_buildSystem->buildDir(m_filePath);
-    input.sysroot = FilePath::fromString(m_buildSystem->qmakeSysroot());
+    input.sysroot = m_buildSystem->qmakeSysroot();
     input.readerExact = m_readerExact;
     input.readerCumulative = m_readerCumulative;
     input.qmakeGlobals = m_buildSystem->qmakeGlobals();
diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.h b/src/plugins/qmakeprojectmanager/qmakeparsernodes.h
index 47fcfe9c51c..f40c843ea3b 100644
--- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.h
+++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.h
@@ -21,10 +21,7 @@
 
 #include <memory>
 
-namespace ProjectExplorer {
-class BuildConfiguration;
-class ExtraCompilerFactory;
-} // ProjectExplorer
+namespace ProjectExplorer { class ExtraCompilerFactory; }
 
 namespace Utils {
 class FilePath;
diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp
index 86b7a3c8c55..afa1692fd9b 100644
--- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp
@@ -851,7 +851,7 @@ QtSupport::ProFileReader *QmakeBuildSystem::createProFileReader(const QmakeProFi
             qmakeArgs = bc->configCommandLineArguments();
 
         QtSupport::QtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(k);
-        m_qmakeSysroot = SysRootKitAspect::sysRoot(k).toString();
+        m_qmakeSysroot = SysRootKitAspect::sysRoot(k);
 
         if (qtVersion && qtVersion->isValid()) {
             m_qmakeGlobals->qmake_abslocation =
@@ -905,7 +905,7 @@ QMakeVfs *QmakeBuildSystem::qmakeVfs()
     return m_qmakeVfs;
 }
 
-QString QmakeBuildSystem::qmakeSysroot()
+const FilePath &QmakeBuildSystem::qmakeSysroot()
 {
     return m_qmakeSysroot;
 }
diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.h b/src/plugins/qmakeprojectmanager/qmakeproject.h
index 1512d467bba..00182c5bf8b 100644
--- a/src/plugins/qmakeprojectmanager/qmakeproject.h
+++ b/src/plugins/qmakeprojectmanager/qmakeproject.h
@@ -118,7 +118,7 @@ public:
     /// \internal
     QMakeVfs *qmakeVfs();
     /// \internal
-    QString qmakeSysroot();
+    const Utils::FilePath &qmakeSysroot();
     /// \internal
     void destroyProFileReader(QtSupport::ProFileReader *reader);
     void deregisterFromCacheManager();
@@ -177,7 +177,7 @@ private:
     int m_qmakeGlobalsRefCnt = 0;
     bool m_invalidateQmakeVfsContents = false;
 
-    QString m_qmakeSysroot;
+    Utils::FilePath m_qmakeSysroot;
 
     std::unique_ptr<QFutureInterface<void>> m_asyncUpdateFutureInterface;
     int m_pendingEvaluateFuturesCount = 0;