forked from qt-creator/qt-creator
Merge remote-tracking branch 'origin/4.10'
Conflicts: src/libs/utils/consoleprocess.h Change-Id: I771630cb4dc60a9e87e9d30d6295040c27348d8c
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -327,7 +327,6 @@ bool fileSizeExceedsLimit(const QFileInfo &fileInfo, int sizeLimitInMb)
|
||||
Core::MessageManager::write(msg, Core::MessageManager::Silent);
|
||||
});
|
||||
|
||||
qWarning().noquote() << msg;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user