From 4465e60afdfb8e45d165d03db88b63270a2d295e Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 26 Mar 2021 19:20:59 +0100 Subject: [PATCH] QMakeProjectManager: Restore original settings defaults The new default "true" for "Ignore qmake's system() function when parsing a project" broke initial parsing of an opened qmake project. Task-number: QTCREATORBUG-25536 Change-Id: Ia155e27051a030b5fbf34ab3b94d7be2b952eb9b Reviewed-by: hjk --- src/plugins/qmakeprojectmanager/qmakesettings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/qmakeprojectmanager/qmakesettings.cpp b/src/plugins/qmakeprojectmanager/qmakesettings.cpp index 8b90fd877d6..e3075b02c78 100644 --- a/src/plugins/qmakeprojectmanager/qmakesettings.cpp +++ b/src/plugins/qmakeprojectmanager/qmakesettings.cpp @@ -42,6 +42,7 @@ QmakeSettings::QmakeSettings() registerAspect(&m_warnAgainstUnalignedBuildDir); m_warnAgainstUnalignedBuildDir.setSettingsKey("QmakeProjectManager/WarnAgainstUnalignedBuildDir"); + m_warnAgainstUnalignedBuildDir.setDefaultValue(true); m_warnAgainstUnalignedBuildDir.setLabelText(tr("Warn if a project's source and " "build directories are not at the same level")); m_warnAgainstUnalignedBuildDir.setToolTip(tr("Qmake has subtle bugs that " @@ -55,7 +56,6 @@ QmakeSettings::QmakeSettings() registerAspect(&m_ignoreSystemFunction); m_ignoreSystemFunction.setSettingsKey("QmakeProjectManager/RunSystemFunction"); - m_ignoreSystemFunction.setDefaultValue(true); m_ignoreSystemFunction.setLabelText(tr("Ignore qmake's system() function when parsing a project")); m_ignoreSystemFunction.setToolTip(tr("Checking this option avoids unwanted side effects, " "but may result in inexact parsing results."));