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

QMake: Fix remote paths handed to the file cache

Browse Source 
Task-number: QTCREATORBUG-28355
Change-Id: I8fe2fe5ea5bb4cdc49547a191ddf1f4af36696ba
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
hjk
2022-11-29 10:55:36 +01:00
parent fd829240ed
commit aad99ea408
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -855,7 +855,7 @@ QtSupport::ProFileReader *QmakeBuildSystem::createProFileReader(const QmakeProFi
if (qtVersion && qtVersion->isValid()) { if (qtVersion && qtVersion->isValid()) {
m_qmakeGlobals->qmake_abslocation = m_qmakeGlobals->qmake_abslocation =
QDir::cleanPath(qtVersion->qmakeFilePath().toString()); QDir::cleanPath(qtVersion->qmakeFilePath().toFSPathString());
qtVersion->applyProperties(m_qmakeGlobals.get()); qtVersion->applyProperties(m_qmakeGlobals.get());
} }
@@ -925,7 +925,7 @@ void QmakeBuildSystem::destroyProFileReader(QtSupport::ProFileReader *reader)
void QmakeBuildSystem::deregisterFromCacheManager() void QmakeBuildSystem::deregisterFromCacheManager()
{ {
QString dir = projectFilePath().toString(); QString dir = projectFilePath().toFSPathString();
if (!dir.endsWith(QLatin1Char('/'))) if (!dir.endsWith(QLatin1Char('/')))
dir += QLatin1Char('/'); dir += QLatin1Char('/');
QtSupport::ProFileCacheManager::instance()->discardFiles(dir, qmakeVfs()); QtSupport::ProFileCacheManager::instance()->discardFiles(dir, qmakeVfs());