diff options
author | Christian Kandeler <christian.kandeler@digia.com> | 2014-07-28 09:53:06 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-07-28 12:00:25 +0200 |
commit | fb09f5cc01bb1d8d34abcff6a767991575376357 (patch) | |
tree | 564e86bbf4d9c3a496460e6ecc1d90111ef73c28 /src/plugins/qbsprojectmanager/qbsproject.cpp | |
parent | 4c7f1c5ea98fead57034826d8fe7064c55ce992f (diff) | |
download | qt-creator-fb09f5cc01bb1d8d34abcff6a767991575376357.tar.gz |
QbsProjectManager: Re-retrieve project data after build.
This fixes the bug that the "run" action fails if the project has not
been built before (because the path to the executable is still unknown
after the build due to the missing project data update).
Change-Id: I953cbb85051a1de78fcb0490abf58ebc9fcec6e7
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/plugins/qbsprojectmanager/qbsproject.cpp')
-rw-r--r-- | src/plugins/qbsprojectmanager/qbsproject.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index 8896e3db58..4a449d6766 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -502,6 +502,8 @@ void QbsProject::cancelParsing() void QbsProject::updateAfterBuild() { + QTC_ASSERT(m_qbsProject.isValid(), return); + m_projectData = m_qbsProject.projectData(); updateBuildTargetData(); } @@ -763,7 +765,7 @@ void QbsProject::updateDeploymentInfo(const qbs::Project &project) qbs::InstallOptions installOptions; installOptions.setInstallRoot(QLatin1String("/")); foreach (const qbs::InstallableFile &f, - project.installableFilesForProject(project.projectData(), installOptions)) { + project.installableFilesForProject(m_projectData, installOptions)) { deploymentData.addFile(f.sourceFilePath(), f.targetDirectory(), f.isExecutable() ? ProjectExplorer::DeployableFile::TypeExecutable : ProjectExplorer::DeployableFile::TypeNormal); @@ -774,7 +776,7 @@ void QbsProject::updateDeploymentInfo(const qbs::Project &project) void QbsProject::updateBuildTargetData() { - updateApplicationTargets(m_qbsProject.projectData()); + updateApplicationTargets(m_projectData); updateDeploymentInfo(m_qbsProject); foreach (Target *t, targets()) t->updateDefaultRunConfigurations(); |