aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmakeprojectmanager/makefileparse.cpp
diff options
context:
space:
mode:
authorDaniel Teske <[email protected]>2015-03-12 14:39:39 +0100
committerDaniel Teske <[email protected]>2015-03-12 13:53:53 +0000
commitd108a54aabe1043afe3d2700ffa0b5afb3869292 (patch)
tree3d5390af752a43994a1f3a39ac55866337a2aeb8 /src/plugins/qmakeprojectmanager/makefileparse.cpp
parentd5195148100af21523574e43fc1713049fc7f5f1 (diff)
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: Nikolai Kosjar <[email protected]> Reviewed-by: Daniel Teske <[email protected]>
Diffstat (limited to 'src/plugins/qmakeprojectmanager/makefileparse.cpp')
-rw-r--r--src/plugins/qmakeprojectmanager/makefileparse.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmakeprojectmanager/makefileparse.cpp b/src/plugins/qmakeprojectmanager/makefileparse.cpp
index 6749fa4a223..3de2b6fcc2a 100644
--- a/src/plugins/qmakeprojectmanager/makefileparse.cpp
+++ b/src/plugins/qmakeprojectmanager/makefileparse.cpp
@@ -376,11 +376,11 @@ BaseQtVersion::QmakeBuildConfigs MakeFileParse::effectiveBuildConfig(BaseQtVersi
{
BaseQtVersion::QmakeBuildConfigs buildConfig = defaultBuildConfig;
if (m_qmakeBuildConfig.explicitDebug)
- buildConfig = buildConfig & BaseQtVersion::DebugBuild;
+ buildConfig = buildConfig | BaseQtVersion::DebugBuild;
else if (m_qmakeBuildConfig.explicitRelease)
buildConfig = buildConfig & ~BaseQtVersion::DebugBuild;
if (m_qmakeBuildConfig.explicitBuildAll)
- buildConfig = buildConfig & BaseQtVersion::BuildAll;
+ buildConfig = buildConfig | BaseQtVersion::BuildAll;
else if (m_qmakeBuildConfig.explicitNoBuildAll)
buildConfig = buildConfig &~ BaseQtVersion::BuildAll;
return buildConfig;