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

Merge remote-tracking branch 'origin/13.0'

Browse Source 
Change-Id: I51f8df79cf2b0f853e2951ed35b2a80369078411
This commit is contained in:
Eike Ziller
2024-05-31 08:25:10 +02:00
parent 1c6ea674d7 81aed65406
commit d29eebf9de
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/mesonprojectmanager/toolkitaspectwidget.h
View File

@@ -49,11 +49,7 @@ private:
return MesonToolKitAspect::mesonToolId(m_kit); return MesonToolKitAspect::mesonToolId(m_kit);
return NinjaToolKitAspect::ninjaToolId(m_kit); return NinjaToolKitAspect::ninjaToolId(m_kit);
}(); }();
if (id.isValid())
m_toolsComboBox->setCurrentIndex(indexOf(id)); m_toolsComboBox->setCurrentIndex(indexOf(id));
else {
setToDefault();
}
} }
QComboBox *m_toolsComboBox; QComboBox *m_toolsComboBox;

2
src/plugins/texteditor/texteditor.cpp
View File

@@ -1020,6 +1020,8 @@ void TextEditorWidgetFind::selectAll(const QString &txt, FindFlags findFlags)
if (future.resultCount() <= 0) if (future.resultCount() <= 0)
return; return;
const SearchResultItems &results = future.result(); const SearchResultItems &results = future.result();
if (results.isEmpty())
return;
const auto cursorForResult = [this](const SearchResultItem &item) { const auto cursorForResult = [this](const SearchResultItem &item) {
return selectRange(m_editor->document(), item.mainRange()); return selectRange(m_editor->document(), item.mainRange());
}; };