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

Merge remote-tracking branch 'origin/4.2'

Browse Source 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/shared/qbs

Change-Id: I5050baa31f4a892d00cd6f7e088d1b597921474d
This commit is contained in:
Eike Ziller
2016-12-05 10:55:35 +01:00
parent 1e70a156f9 c390c716d1
commit 8f0ddff1cc
35 changed files with 452 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
View File

@@ -102,6 +102,8 @@ enum { debug = 0 };
QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target)
: QmakeBuildConfiguration(target, Core::Id(QMAKE_BC_ID))
{
connect(this, &BuildConfiguration::buildDirectoryChanged,
this, &QmakeBuildConfiguration::emitProFileEvaluateNeeded);
}
QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target, Core::Id id) :
@@ -223,14 +225,6 @@ bool QmakeBuildConfiguration::isShadowBuild() const
return buildDirectory() != target()->project()->projectDirectory();
}
void QmakeBuildConfiguration::setBuildDirectory(const FileName &directory)
{
if (directory == buildDirectory())
return;
BuildConfiguration::setBuildDirectory(directory);
emitProFileEvaluateNeeded();
}
QString QmakeBuildConfiguration::makefile() const
{
return static_cast<QmakeProject *>(target()->project())->rootProjectNode()->makefile();