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

QMake: Use FilePath for sysroot

Browse Source 
Less roundtrips.

Change-Id: I0f98629398170f5d1d4ccd60cfaa0d54f8e2b9f3
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
hjk
2022-11-29 10:47:42 +01:00
parent 669242b9d8
commit f7d022009b
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
View File

@@ -1301,7 +1301,7 @@ QmakeEvalInput QmakeProFile::evalInput() const
input.projectDir = directoryPath().toFSPathString(); input.projectDir = directoryPath().toFSPathString();
input.projectFilePath = filePath(); input.projectFilePath = filePath();
input.buildDirectory = m_buildSystem->buildDir(m_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.readerExact = m_readerExact;
input.readerCumulative = m_readerCumulative; input.readerCumulative = m_readerCumulative;
input.qmakeGlobals = m_buildSystem->qmakeGlobals(); input.qmakeGlobals = m_buildSystem->qmakeGlobals();

5
src/plugins/qmakeprojectmanager/qmakeparsernodes.h
View File

@@ -21,10 +21,7 @@
#include <memory> #include <memory>
namespace ProjectExplorer { namespace ProjectExplorer { class ExtraCompilerFactory; }
class BuildConfiguration;
class ExtraCompilerFactory;
} // ProjectExplorer
namespace Utils { namespace Utils {
class FilePath; class FilePath;

4
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -851,7 +851,7 @@ QtSupport::ProFileReader *QmakeBuildSystem::createProFileReader(const QmakeProFi
qmakeArgs = bc->configCommandLineArguments(); qmakeArgs = bc->configCommandLineArguments();
QtSupport::QtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(k); QtSupport::QtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(k);
m_qmakeSysroot = SysRootKitAspect::sysRoot(k).toString(); m_qmakeSysroot = SysRootKitAspect::sysRoot(k);
if (qtVersion && qtVersion->isValid()) { if (qtVersion && qtVersion->isValid()) {
m_qmakeGlobals->qmake_abslocation = m_qmakeGlobals->qmake_abslocation =
@@ -905,7 +905,7 @@ QMakeVfs *QmakeBuildSystem::qmakeVfs()
return m_qmakeVfs; return m_qmakeVfs;
} }
QString QmakeBuildSystem::qmakeSysroot() const FilePath &QmakeBuildSystem::qmakeSysroot()
{ {
return m_qmakeSysroot; return m_qmakeSysroot;
} }

4
src/plugins/qmakeprojectmanager/qmakeproject.h
View File

@@ -118,7 +118,7 @@ public:
/// \internal /// \internal
QMakeVfs *qmakeVfs(); QMakeVfs *qmakeVfs();
/// \internal /// \internal
QString qmakeSysroot(); const Utils::FilePath &qmakeSysroot();
/// \internal /// \internal
void destroyProFileReader(QtSupport::ProFileReader *reader); void destroyProFileReader(QtSupport::ProFileReader *reader);
void deregisterFromCacheManager(); void deregisterFromCacheManager();
@@ -177,7 +177,7 @@ private:
int m_qmakeGlobalsRefCnt = 0; int m_qmakeGlobalsRefCnt = 0;
bool m_invalidateQmakeVfsContents = false; bool m_invalidateQmakeVfsContents = false;
QString m_qmakeSysroot; Utils::FilePath m_qmakeSysroot;
std::unique_ptr<QFutureInterface<void>> m_asyncUpdateFutureInterface; std::unique_ptr<QFutureInterface<void>> m_asyncUpdateFutureInterface;
int m_pendingEvaluateFuturesCount = 0; int m_pendingEvaluateFuturesCount = 0;