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/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp

Change-Id: I722a94f37bdd1d78625cfae503ba6d02ff083c63
This commit is contained in:
Eike Ziller
2021-03-25 11:06:59 +01:00
parent 01713d4dfd 9a95611e54
commit b213c87cf4
143 changed files with 986 additions and 1081 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/languageclient/languageclientsettings.cpp
View File

@@ -193,7 +193,7 @@ LanguageClientSettingsPageWidget::LanguageClientSettingsPageWidget(LanguageClien
auto addMenu = new QMenu;
addMenu->clear();
for (const ClientType &type : clientTypes()) {
auto action = new QAction(tr("New %1").arg(type.name));
auto action = new QAction(LanguageClientSettingsPage::tr("New %1").arg(type.name));
connect(action, &QAction::triggered, this, [this, id = type.id]() { addItem(id); });
addMenu->addAction(action);
}

8
src/plugins/languageclient/lspinspector.cpp
View File

@@ -235,7 +235,7 @@ LspLogWidget::LspLogWidget()
m_clientDetails = new MessageDetailWidget;
m_clientDetails->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
m_clientDetails->setTitle(tr("Client Message"));
m_clientDetails->setTitle(LspInspector::tr("Client Message"));
addWidget(m_clientDetails);
setStretchFactor(0, 1);
@@ -243,7 +243,7 @@ LspLogWidget::LspLogWidget()
m_messages = new QListView;
m_messages->setModel(&m_model);
m_messages->setAlternatingRowColors(true);
m_model.setHeader({tr("Messages")});
m_model.setHeader({LspInspector::tr("Messages")});
m_messages->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Expanding);
m_messages->setSelectionMode(QAbstractItemView::MultiSelection);
addWidget(m_messages);
@@ -251,7 +251,7 @@ LspLogWidget::LspLogWidget()
m_serverDetails = new MessageDetailWidget;
m_serverDetails->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
m_serverDetails->setTitle(tr("Server Message"));
m_serverDetails->setTitle(LspInspector::tr("Server Message"));
addWidget(m_serverDetails);
setStretchFactor(2, 1);
@@ -341,7 +341,7 @@ void LspLogWidget::saveLog()
stream << "\n\n";
});
const QString fileName = QFileDialog::getSaveFileName(this, tr("Log File"));
const QString fileName = QFileDialog::getSaveFileName(this, LspInspector::tr("Log File"));
if (fileName.isEmpty())
return;
Utils::FileSaver saver(fileName, QIODevice::Text);