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

Merge remote-tracking branch 'origin/4.0' into 4.1

Browse Source 
Conflicts:
	src/shared/qbs

Change-Id: Id363df58f4f9bda5128a486e942f14179160cb86
This commit is contained in:
Eike Ziller
2016-07-05 11:15:19 +02:00
parent 71e3833185 ce4ddcb060
commit 57c2c595ca
3 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
View File

@@ -271,7 +271,7 @@ QString QbsRunConfiguration::baseWorkingDirectory() const
void QbsRunConfiguration::addToBaseEnvironment(Utils::Environment &env) const
{
QbsProject *project = static_cast<QbsProject *>(target()->project());
if (project) {
if (project && project->qbsProject().isValid()) {
const qbs::ProductData product = findProduct(project->qbsProjectData(), m_uniqueProductName);
if (product.isValid()) {
QProcessEnvironment procEnv = env.toProcessEnvironment();