feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QMakePM: Restore old system() handling to old behavior

Browse Source 
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 <christian.kandeler@qt.io>
This commit is contained in:
Christian Stenger
2020-10-22 09:38:59 +02:00
parent 73a26c0039
commit 860eeca6c5
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmakeprojectmanager/qmakesettings.cpp
View File

@@ -92,7 +92,7 @@ void QmakeSettings::loadSettings()
m_settings.warnAgainstUnalignedBuildDir = s->value( m_settings.warnAgainstUnalignedBuildDir = s->value(
BUILD_DIR_WARNING_KEY, Utils::HostOsInfo::isWindowsHost()).toBool(); BUILD_DIR_WARNING_KEY, Utils::HostOsInfo::isWindowsHost()).toBool();
m_settings.alwaysRunQmake = s->value(ALWAYS_RUN_QMAKE_KEY, false).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 void QmakeSettings::storeSettings() const
@@ -121,8 +121,8 @@ public:
m_alwaysRunQmakeCheckbox.setChecked(QmakeSettings::alwaysRunQmake()); m_alwaysRunQmakeCheckbox.setChecked(QmakeSettings::alwaysRunQmake());
m_ignoreSystemCheckbox.setText(tr("Ignore qmake's system() function " m_ignoreSystemCheckbox.setText(tr("Ignore qmake's system() function "
"when parsing a project")); "when parsing a project"));
m_ignoreSystemCheckbox.setToolTip(tr("Unchecking this option can help getting more exact " m_ignoreSystemCheckbox.setToolTip(tr("Checking this option avoids unwanted side effects, "
"parsing results, but can have unwanted side effects.")); "but may result in inexact parsing results."));
m_ignoreSystemCheckbox.setChecked(!QmakeSettings::runSystemFunction()); m_ignoreSystemCheckbox.setChecked(!QmakeSettings::runSystemFunction());
const auto layout = new QVBoxLayout(this); const auto layout = new QVBoxLayout(this);
layout->addWidget(&m_warnAgainstUnalignedBuildDirCheckbox); layout->addWidget(&m_warnAgainstUnalignedBuildDirCheckbox);

2
src/plugins/qmakeprojectmanager/qmakesettings.h
View File

@@ -37,7 +37,7 @@ class QmakeSettingsData {
public: public:
bool warnAgainstUnalignedBuildDir = false; bool warnAgainstUnalignedBuildDir = false;
bool alwaysRunQmake = false; bool alwaysRunQmake = false;
bool runSystemFunction = false; bool runSystemFunction = true;
}; };
class QmakeSettings : public QObject class QmakeSettings : public QObject