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

CMakeProjectManager: Give some hints why deployment data looks wrong

Browse Source 
Change-Id: If42b32ca80f4144b86ff882e0db243ba9f0f5cbf
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2023-03-31 16:52:22 +02:00
parent e0694c52d9
commit 242d19c19d
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
View File

@@ -747,7 +747,11 @@ void CMakeBuildSystem::handleParsingSucceeded(bool restoredFromBackup)
m_ctestPath = tool->cmakeExecutable().withNewPath(m_reader.ctestPath()); m_ctestPath = tool->cmakeExecutable().withNewPath(m_reader.ctestPath());
setApplicationTargets(appTargets()); setApplicationTargets(appTargets());
setDeploymentData(deploymentData());
// Note: This is practically always wrong and resulting in an empty view.
// Setting the real data is triggered from a successful run of a
// MakeInstallStep.
setDeploymentData(deploymentDataFromFile());
QTC_ASSERT(m_waitingForParse, return ); QTC_ASSERT(m_waitingForParse, return );
m_waitingForParse = false; m_waitingForParse = false;
@@ -1064,7 +1068,7 @@ CommandLine CMakeBuildSystem::commandLineForTests(const QList<QString> &tests,
return {m_ctestPath, args}; return {m_ctestPath, args};
} }
DeploymentData CMakeBuildSystem::deploymentData() const DeploymentData CMakeBuildSystem::deploymentDataFromFile() const
{ {
DeploymentData result; DeploymentData result;

2
src/plugins/cmakeprojectmanager/cmakebuildsystem.h
View File

@@ -67,7 +67,7 @@ public:
const QList<ProjectExplorer::BuildTargetInfo> appTargets() const; const QList<ProjectExplorer::BuildTargetInfo> appTargets() const;
QStringList buildTargetTitles() const; QStringList buildTargetTitles() const;
const QList<CMakeBuildTarget> &buildTargets() const; const QList<CMakeBuildTarget> &buildTargets() const;
ProjectExplorer::DeploymentData deploymentData() const; ProjectExplorer::DeploymentData deploymentDataFromFile() const;
CMakeBuildConfiguration *cmakeBuildConfiguration() const; CMakeBuildConfiguration *cmakeBuildConfiguration() const;