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 
Change-Id: Ide723c45dcd7e39e4e54432f2dc265c5d53c38eb
This commit is contained in:
Eike Ziller
2021-04-21 08:41:20 +02:00
parent 09d24face0 2a456e5439
commit 9c2980f65d
36 changed files with 60 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/coreplugin/outputwindow.cpp
View File

@@ -526,6 +526,7 @@ void OutputWindow::reset()
flush();
d->queueTimer.stop();
d->formatter.reset();
d->scrollToBottom = true;
if (!d->queuedOutput.isEmpty()) {
d->queuedOutput.clear();
d->formatter.appendMessage(tr("[Discarding excessive amount of pending output.]\n"),

4
src/plugins/debugger/peripheralregisterhandler.h
View File

@@ -82,8 +82,8 @@ class PeripheralRegisterValue final
{
public:
PeripheralRegisterValue(quint64 v = 0) : v(v) {}
bool operator==(const PeripheralRegisterValue &other) { return v == other.v; }
bool operator!=(const PeripheralRegisterValue &other) { return !operator==(other); }
bool operator==(const PeripheralRegisterValue &other) const { return v == other.v; }
bool operator!=(const PeripheralRegisterValue &other) const { return !operator==(other); }
bool fromString(const QString &string, PeripheralRegisterFormat fmt);
QString toString(int size, PeripheralRegisterFormat fmt) const;

11
src/plugins/genericprojectmanager/genericproject.cpp
View File

@@ -251,7 +251,14 @@ GenericBuildSystem::GenericBuildSystem(Target *target)
connect(&m_deployFileWatcher, &FileSystemWatcher::fileChanged,
this, &GenericBuildSystem::updateDeploymentData);
connect(target, &Target::activeBuildConfigurationChanged, this, [this] { refresh(Everything); });
connect(target, &Target::activeBuildConfigurationChanged, this, [this, target] {
if (target == project()->activeTarget())
refresh(Everything);
});
connect(project(), &Project::activeTargetChanged, this, [this, target] {
if (target == project()->activeTarget())
refresh(Everything);
});
}
GenericBuildSystem::~GenericBuildSystem()
@@ -553,6 +560,8 @@ void GenericBuildSystem::refreshCppCodeModel()
{
if (!m_cppCodeModelUpdater)
return;
if (target() != project()->activeTarget())
return;
QtSupport::CppKitInfo kitInfo(kit());
QTC_ASSERT(kitInfo.isValid(), return);

9
src/plugins/projectexplorer/kitmanager.cpp
View File

@@ -240,10 +240,11 @@ void KitManager::restoreKits()
kitsToCheck.clear();
// Remove replacement kits for which the original kit has turned up again.
erase(resultList, [&resultList](const std::unique_ptr<Kit> &k) {
return k->isReplacementKit() && contains(resultList, [&k](const std::unique_ptr<Kit> &other) {
return other->id() == k->id() && other != k;
});
Utils::erase(resultList, [&resultList](const std::unique_ptr<Kit> &k) {
return k->isReplacementKit()
&& contains(resultList, [&k](const std::unique_ptr<Kit> &other) {
return other->id() == k->id() && other != k;
});
});
static const auto kitMatchesAbiList = [](const Kit *kit, const Abis &abis) {