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

CMake: Send compact JSON output to cmake server

Browse Source 
Change-Id: I0e02f122bdb2b1b417a70aa4933cc4246d6969c6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2016-11-30 15:05:55 +01:00
parent e487b3bd55
commit c54fe23579
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cmakeprojectmanager/servermode.cpp
View File

@@ -166,7 +166,7 @@ void ServerMode::sendRequest(const QString &type, const QVariantMap &extra, cons
QJsonDocument document;
document.setObject(object);
const QByteArray rawData = START_MAGIC + document.toJson() + END_MAGIC;
const QByteArray rawData = START_MAGIC + document.toJson(QJsonDocument::Compact) + END_MAGIC;
qCDebug(cmakeServerMode) << ">>>" << rawData;
m_cmakeSocket->write(rawData);
m_cmakeSocket->flush();

3
src/plugins/cmakeprojectmanager/servermodereader.cpp
View File

@@ -142,11 +142,12 @@ void ServerModeReader::parse(bool force)
{
QTC_ASSERT(m_cmakeServer, return);
QVariantMap extra;
if (force)
if (force) {
extra.insert("cacheArguments", QVariant(transform(m_parameters.configuration,
[this](const CMakeConfigItem &i) {
return i.toArgument(m_parameters.expander);
})));
}
m_future.reset(new QFutureInterface<void>());
m_future->setProgressRange(0, MAX_PROGRESS);