Commit d108a54a authored by Daniel Teske's avatar Daniel Teske
Browse files

QmakeProjectManager: Don't rerun qmake for debug builds



With a release Qt build. Wrong bit fiddeling.

Task-number: QTCREATORBUG-14129
Change-Id: I7021ff74c9936e6007eec863e4ebfd948e6dbe90
Reviewed-by: default avatarNikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: default avatarDaniel Teske <daniel.teske@theqtcompany.com>
parent d5195148
...@@ -376,11 +376,11 @@ BaseQtVersion::QmakeBuildConfigs MakeFileParse::effectiveBuildConfig(BaseQtVersi ...@@ -376,11 +376,11 @@ BaseQtVersion::QmakeBuildConfigs MakeFileParse::effectiveBuildConfig(BaseQtVersi
{ {
BaseQtVersion::QmakeBuildConfigs buildConfig = defaultBuildConfig; BaseQtVersion::QmakeBuildConfigs buildConfig = defaultBuildConfig;
if (m_qmakeBuildConfig.explicitDebug) if (m_qmakeBuildConfig.explicitDebug)
buildConfig = buildConfig & BaseQtVersion::DebugBuild; buildConfig = buildConfig | BaseQtVersion::DebugBuild;
else if (m_qmakeBuildConfig.explicitRelease) else if (m_qmakeBuildConfig.explicitRelease)
buildConfig = buildConfig & ~BaseQtVersion::DebugBuild; buildConfig = buildConfig & ~BaseQtVersion::DebugBuild;
if (m_qmakeBuildConfig.explicitBuildAll) if (m_qmakeBuildConfig.explicitBuildAll)
buildConfig = buildConfig & BaseQtVersion::BuildAll; buildConfig = buildConfig | BaseQtVersion::BuildAll;
else if (m_qmakeBuildConfig.explicitNoBuildAll) else if (m_qmakeBuildConfig.explicitNoBuildAll)
buildConfig = buildConfig &~ BaseQtVersion::BuildAll; buildConfig = buildConfig &~ BaseQtVersion::BuildAll;
return buildConfig; return buildConfig;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment