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

Merge remote-tracking branch 'origin/4.15'

Browse Source 
Conflicts:
	src/libs/languageserverprotocol/workspace.cpp
	src/libs/languageserverprotocol/workspace.h

Change-Id: I739ae6642b1e2a505e351903f19df2550ef01629
This commit is contained in:
Eike Ziller
2021-05-12 15:27:30 +02:00
parent edf6178896 0cef9a8554
commit 3823b0af5f
4 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
View File

@@ -145,7 +145,8 @@ void Qt5NodeInstanceServer::resizeCanvasToRootItem()
{ {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
m_viewData.bufferDirty = true; m_viewData.bufferDirty = true;
m_viewData.contentItem->setPosition(-m_viewData.rootItem->position()); if (m_viewData.contentItem)
m_viewData.contentItem->setPosition(-m_viewData.rootItem->position());
#endif #endif
quickWindow()->resize(rootNodeInstance().boundingRect().size().toSize()); quickWindow()->resize(rootNodeInstance().boundingRect().size().toSize());
} }

6
src/libs/languageserverprotocol/workspace.h
View File

@@ -109,7 +109,7 @@ class LANGUAGESERVERPROTOCOL_EXPORT ConfigurationParams : public JsonObject
{ {
public: public:
using JsonObject::JsonObject; using JsonObject::JsonObject;
class ConfigureationItem : public JsonObject class LANGUAGESERVERPROTOCOL_EXPORT ConfigurationItem : public JsonObject
{ {
public: public:
using JsonObject::JsonObject; using JsonObject::JsonObject;
@@ -125,8 +125,8 @@ public:
bool isValid() const override { return contains(scopeUriKey); } bool isValid() const override { return contains(scopeUriKey); }
}; };
QList<ConfigureationItem> items() const { return array<ConfigureationItem>(itemsKey); } QList<ConfigurationItem> items() const { return array<ConfigurationItem>(itemsKey); }
void setItems(const QList<ConfigureationItem> &items) { insertArray(itemsKey, items); } void setItems(const QList<ConfigurationItem> &items) { insertArray(itemsKey, items); }
bool isValid() const override { return contains(itemsKey); } bool isValid() const override { return contains(itemsKey); }
}; };

8
src/plugins/autotest/gtest/gtestvisitors.cpp
View File

@@ -94,8 +94,12 @@ bool GTestVisitor::visit(CPlusPlus::FunctionDefinitionAST *ast)
testCaseName.clear(); testCaseName.clear();
} }
} else { } else {
const CPlusPlus::Argument *testSuiteNameArg = ast->symbol->argumentAt(0)->asArgument(); const CPlusPlus::Symbol *firstArg = ast->symbol->argumentAt(0);
const CPlusPlus::Argument *testCaseNameArg = ast->symbol->argumentAt(1)->asArgument(); const CPlusPlus::Symbol *secondArg = ast->symbol->argumentAt(1);
if (!firstArg || !secondArg)
return false;
const CPlusPlus::Argument *testSuiteNameArg = firstArg->asArgument();
const CPlusPlus::Argument *testCaseNameArg = secondArg->asArgument();
if (testSuiteNameArg && testCaseNameArg) { if (testSuiteNameArg && testCaseNameArg) {
testSuiteName = m_overview.prettyType(testSuiteNameArg->type()); testSuiteName = m_overview.prettyType(testSuiteNameArg->type());
testCaseName = m_overview.prettyType(testCaseNameArg->type()); testCaseName = m_overview.prettyType(testCaseNameArg->type());

8
src/plugins/coreplugin/find/searchresultwindow.cpp
View File

@@ -499,15 +499,15 @@ SearchResult *SearchResultWindow::startNewSearch(const QString &label,
const QString &cfgGroup) const QString &cfgGroup)
{ {
if (d->m_searchResults.size() >= MAX_SEARCH_HISTORY) { if (d->m_searchResults.size() >= MAX_SEARCH_HISTORY) {
if (d->m_currentIndex >= d->m_recentSearchesBox->count() - 1) {
// temporarily set the index to the last but one existing
d->m_currentIndex = d->m_recentSearchesBox->count() - 2;
}
d->m_searchResultWidgets.last()->notifyVisibilityChanged(false); d->m_searchResultWidgets.last()->notifyVisibilityChanged(false);
// widget first, because that might send interesting signals to SearchResult // widget first, because that might send interesting signals to SearchResult
delete d->m_searchResultWidgets.takeLast(); delete d->m_searchResultWidgets.takeLast();
delete d->m_searchResults.takeLast(); delete d->m_searchResults.takeLast();
d->m_recentSearchesBox->removeItem(d->m_recentSearchesBox->count()-1); d->m_recentSearchesBox->removeItem(d->m_recentSearchesBox->count()-1);
if (d->m_currentIndex >= d->m_recentSearchesBox->count()) {
// temporarily set the index to the last existing
d->m_currentIndex = d->m_recentSearchesBox->count() - 1;
}
} }
auto widget = new SearchResultWidget; auto widget = new SearchResultWidget;
connect(widget, &SearchResultWidget::filterInvalidated, this, [this, widget] { connect(widget, &SearchResultWidget::filterInvalidated, this, [this, widget] {