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

QtSupport: Pass empty device root for local Qt

Browse Source 
Fixes: QTCREATORBUG-28680
Change-Id: Id90b6b9427d4b85ebc4e9f097dfdd996062d4c85
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2023-01-23 11:53:10 +01:00
parent 9938fffe06
commit c3e44bb3bb
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qtsupport/baseqtversion.cpp
View File

@@ -1123,7 +1123,8 @@ void QtVersion::ensureMkSpecParsed() const
Environment env = d->m_qmakeCommand.deviceEnvironment(); Environment env = d->m_qmakeCommand.deviceEnvironment();
setupQmakeRunEnvironment(env); setupQmakeRunEnvironment(env);
option.environment = env.toProcessEnvironment(); option.environment = env.toProcessEnvironment();
option.device_root = d->m_qmakeCommand.withNewPath("/").toFSPathString(); if (d->m_qmakeCommand.needsDevice())
option.device_root = d->m_qmakeCommand.withNewPath("/").toFSPathString(); // Empty for host!
ProMessageHandler msgHandler(true); ProMessageHandler msgHandler(true);
ProFileCacheManager::instance()->incRefCount(); ProFileCacheManager::instance()->incRefCount();
QMakeParser parser(ProFileCacheManager::instance()->cache(), &vfs, &msgHandler); QMakeParser parser(ProFileCacheManager::instance()->cache(), &vfs, &msgHandler);