Merge remote-tracking branch 'origin/4.10'

Conflicts:
	src/libs/utils/consoleprocess.h

Change-Id: I771630cb4dc60a9e87e9d30d6295040c27348d8c
This commit is contained in:
Eike Ziller
2019-06-20 11:03:05 +02:00
268 changed files with 5888 additions and 178 deletions

View File

@@ -62,6 +62,7 @@
#include <projectexplorer/projectmacro.h>
#include <projectexplorer/session.h>
#include <utils/fileutils.h>
#include <utils/hostosinfo.h>
#include <utils/qtcassert.h>
#include <QCoreApplication>
@@ -513,6 +514,10 @@ CppModelManager::CppModelManager()
d->m_indexingSupporter = nullptr;
d->m_enableGC = true;
// Visual C++ has 1MiB, macOSX has 512KiB
if (Utils::HostOsInfo::isWindowsHost() || Utils::HostOsInfo::isMacHost())
d->m_threadPool.setStackSize(2 * 1024 * 1024);
qRegisterMetaType<QSet<QString> >();
connect(this, &CppModelManager::sourceFilesRefreshed,
this, &CppModelManager::onSourceFilesRefreshed);

View File

@@ -327,7 +327,6 @@ bool fileSizeExceedsLimit(const QFileInfo &fileInfo, int sizeLimitInMb)
Core::MessageManager::write(msg, Core::MessageManager::Silent);
});
qWarning().noquote() << msg;
return true;
}