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

Merge remote-tracking branch 'origin/12.0'

Browse Source 
Change-Id: I35cb28b759fb200c45a1496299584132336fcd1c
This commit is contained in:
Eike Ziller
2023-11-08 09:03:59 +01:00
parent baaf00d43f 05ef0d9cb9
commit 363d2d161c
80 changed files with 539 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/utils/aspects.cpp
View File

@@ -84,6 +84,7 @@ public:
bool m_enabled = true;
bool m_readOnly = false;
bool m_autoApply = true;
bool m_hasEnabler = false;
int m_spanX = 1;
int m_spanY = 1;
BaseAspect::ConfigWidgetCreator m_configWidgetCreator;
@@ -348,6 +349,8 @@ void BaseAspect::setEnabler(BoolAspect *checker)
{
QTC_ASSERT(checker, return);
d->m_hasEnabler = true;
auto update = [this, checker] {
BaseAspect::setEnabled(checker->isEnabled() && checker->volatileValue());
};
@@ -647,6 +650,10 @@ void BaseAspect::readSettings()
if (settingsKey().isEmpty())
return;
QTC_ASSERT(theSettings, return);
// The enabler needs to be set up after reading the settings, otherwise
// changes from reading the settings will not update the enabled state
// because the updates are "quiet".
QTC_CHECK(!d->m_hasEnabler);
const QVariant val = theSettings->value(settingsKey());
setVariantValue(val.isValid() ? fromSettingsValue(val) : defaultVariantValue(), BeQuiet);
}
@@ -1795,8 +1802,6 @@ LayoutItem BoolAspect::adoptButton(QAbstractButton *button)
*/
void BoolAspect::addToLayout(Layouting::LayoutItem &parent)
{
QTC_ASSERT(m_buffer == m_internal, m_buffer = m_internal);
QCheckBox *checkBox = createSubWidget<QCheckBox>();
addToLayoutHelper(parent, checkBox);
bufferToGui();
@@ -1904,7 +1909,6 @@ void SelectionAspect::addToLayout(Layouting::LayoutItem &parent)
QTC_CHECK(d->m_buttonGroup == nullptr);
QTC_CHECK(!d->m_comboBox);
QTC_ASSERT(d->m_buttons.isEmpty(), d->m_buttons.clear());
QTC_ASSERT(m_buffer == m_internal, m_buffer = m_internal);
switch (d->m_displayStyle) {
case DisplayStyle::RadioButtons: