diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2016-08-31 14:40:38 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-08-31 14:40:38 +0200 |
| commit | c56aa52b8082bf39bd822f8d110f4a41757100f9 (patch) | |
| tree | 22ee09ed89b75d1e08674f5836bb516c8f1ab048 /src/plugins/qmakeprojectmanager | |
| parent | a4bf137a9f0319c6f3b9ecc3345d1ab9520f128c (diff) | |
| parent | 89ff2c1db5ee2068cf763ff1789b17b7f2afa118 (diff) | |
| download | qt-creator-c56aa52b8082bf39bd822f8d110f4a41757100f9.tar.gz | |
Merge remote-tracking branch 'origin/4.1'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/plugins/qmakeprojectmanager/makestep.cpp
src/shared/qbs
Change-Id: If1787ed23afa786ed2cef57f53c1db642559cbe0
Diffstat (limited to 'src/plugins/qmakeprojectmanager')
| -rw-r--r-- | src/plugins/qmakeprojectmanager/makestep.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/qmakeprojectmanager/makestep.cpp b/src/plugins/qmakeprojectmanager/makestep.cpp index d69eb56f64..a824ddafac 100644 --- a/src/plugins/qmakeprojectmanager/makestep.cpp +++ b/src/plugins/qmakeprojectmanager/makestep.cpp @@ -113,6 +113,8 @@ QString MakeStep::effectiveMakeCommand() const QString makeCmd = m_makeCmd; if (makeCmd.isEmpty()) { QmakeBuildConfiguration *bc = qmakeBuildConfiguration(); + if (!bc) + bc = qobject_cast<QmakeBuildConfiguration *>(target()->activeBuildConfiguration()); ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit(), ToolChain::Language::Cxx); if (bc && tc) |