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

Merge remote-tracking branch 'origin/7.0'

Browse Source 
Change-Id: Ica0f410a8248722cef95a9cbf3929a2d29bf91c0
This commit is contained in:
Eike Ziller
2022-04-27 11:19:31 +02:00
parent 0da130c4ef b748f531ee
commit 0d586e96ec
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1091,13 +1091,15 @@ void StringAspect::addToLayout(LayoutBuilder &builder)
useMacroExpander(d->m_pathChooserDisplay->lineEdit()); useMacroExpander(d->m_pathChooserDisplay->lineEdit());
if (isAutoApply()) { if (isAutoApply()) {
if (d->m_autoApplyOnEditingFinished) { if (d->m_autoApplyOnEditingFinished) {
connect(d->m_pathChooserDisplay, &PathChooser::editingFinished, this, [this] { const auto setPathChooserValue = [this] {
if (d->m_blockAutoApply) if (d->m_blockAutoApply)
return; return;
d->m_blockAutoApply = true; d->m_blockAutoApply = true;
setValue(d->m_pathChooserDisplay->filePath().toString()); setValue(d->m_pathChooserDisplay->filePath().toString());
d->m_blockAutoApply = false; d->m_blockAutoApply = false;
}); };
connect(d->m_pathChooserDisplay, &PathChooser::editingFinished, this, setPathChooserValue);
connect(d->m_pathChooserDisplay, &PathChooser::browsingFinished, this, setPathChooserValue);
} else { } else {
connect(d->m_pathChooserDisplay, &PathChooser::pathChanged, connect(d->m_pathChooserDisplay, &PathChooser::pathChanged,
this, [this](const QString &path) { this, [this](const QString &path) {

2
src/plugins/coreplugin/manhattanstyle.cpp
View File

@@ -409,7 +409,7 @@ int ManhattanStyle::styleHint(StyleHint hint, const QStyleOption *option, const
ret = QFormLayout::AllNonFixedFieldsGrow; ret = QFormLayout::AllNonFixedFieldsGrow;
break; break;
case QStyle::SH_Widget_Animation_Duration: case QStyle::SH_Widget_Animation_Duration:
if (widget->inherits("QTreeView")) if (widget && widget->inherits("QTreeView"))
ret = 0; ret = 0;
break; break;
default: default: