From 860eeca6c581427958fa3315f4d6358182df19f1 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 22 Oct 2020 09:38:59 +0200 Subject: [PATCH] QMakePM: Restore old system() handling to old behavior Parsing qmake based projects without execution of system() may lead to inexact parse result and can end up with unusable projects. Amends dd62254. Change-Id: I7300a810c82959aab159d2492b4020998d26de38 Reviewed-by: Christian Kandeler --- src/plugins/qmakeprojectmanager/qmakesettings.cpp | 6 +++--- src/plugins/qmakeprojectmanager/qmakesettings.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakesettings.cpp b/src/plugins/qmakeprojectmanager/qmakesettings.cpp index b0edf3a404d..cd77fcf3e2d 100644 --- a/src/plugins/qmakeprojectmanager/qmakesettings.cpp +++ b/src/plugins/qmakeprojectmanager/qmakesettings.cpp @@ -92,7 +92,7 @@ void QmakeSettings::loadSettings() m_settings.warnAgainstUnalignedBuildDir = s->value( BUILD_DIR_WARNING_KEY, Utils::HostOsInfo::isWindowsHost()).toBool(); m_settings.alwaysRunQmake = s->value(ALWAYS_RUN_QMAKE_KEY, false).toBool(); - m_settings.runSystemFunction = s->value(RUN_SYSTEM_KEY, false).toBool(); + m_settings.runSystemFunction = s->value(RUN_SYSTEM_KEY, true).toBool(); } void QmakeSettings::storeSettings() const @@ -121,8 +121,8 @@ public: m_alwaysRunQmakeCheckbox.setChecked(QmakeSettings::alwaysRunQmake()); m_ignoreSystemCheckbox.setText(tr("Ignore qmake's system() function " "when parsing a project")); - m_ignoreSystemCheckbox.setToolTip(tr("Unchecking this option can help getting more exact " - "parsing results, but can have unwanted side effects.")); + m_ignoreSystemCheckbox.setToolTip(tr("Checking this option avoids unwanted side effects, " + "but may result in inexact parsing results.")); m_ignoreSystemCheckbox.setChecked(!QmakeSettings::runSystemFunction()); const auto layout = new QVBoxLayout(this); layout->addWidget(&m_warnAgainstUnalignedBuildDirCheckbox); diff --git a/src/plugins/qmakeprojectmanager/qmakesettings.h b/src/plugins/qmakeprojectmanager/qmakesettings.h index 0225a00bd7d..b64bb5087c8 100644 --- a/src/plugins/qmakeprojectmanager/qmakesettings.h +++ b/src/plugins/qmakeprojectmanager/qmakesettings.h @@ -37,7 +37,7 @@ class QmakeSettingsData { public: bool warnAgainstUnalignedBuildDir = false; bool alwaysRunQmake = false; - bool runSystemFunction = false; + bool runSystemFunction = true; }; class QmakeSettings : public QObject