Changeset View
Changeset View
Standalone View
Standalone View
plugins/cmake/cmakeserverimportjob.cpp
Show First 20 Lines • Show All 157 Lines • ▼ Show 20 Line(s) | 155 | { | |||
---|---|---|---|---|---|
158 | else | 158 | else | ||
159 | connect(m_server.data(), &CMakeServer::connected, this, &CMakeServerImportJob::doStart); | 159 | connect(m_server.data(), &CMakeServer::connected, this, &CMakeServerImportJob::doStart); | ||
160 | } | 160 | } | ||
161 | 161 | | |||
162 | void CMakeServerImportJob::doStart() | 162 | void CMakeServerImportJob::doStart() | ||
163 | { | 163 | { | ||
164 | connect(m_server.data(), &CMakeServer::response, this, &CMakeServerImportJob::processResponse); | 164 | connect(m_server.data(), &CMakeServer::response, this, &CMakeServerImportJob::processResponse); | ||
165 | 165 | | |||
166 | m_server->handshake(m_project->path(), CMake::currentBuildDir(m_project)); | 166 | // maybe use the canonical project path too? | ||
167 | m_server->handshake(m_project->path(), CMake::currentBuildDir(m_project, true)); | ||||
167 | } | 168 | } | ||
168 | 169 | | |||
169 | void CMakeServerImportJob::processResponse(const QJsonObject& response) | 170 | void CMakeServerImportJob::processResponse(const QJsonObject& response) | ||
170 | { | 171 | { | ||
171 | const auto responseType = response.value(QStringLiteral("type")); | 172 | const auto responseType = response.value(QStringLiteral("type")); | ||
172 | if (responseType == QLatin1String("reply")) { | 173 | if (responseType == QLatin1String("reply")) { | ||
173 | const auto inReplyTo = response.value(QStringLiteral("inReplyTo")); | 174 | const auto inReplyTo = response.value(QStringLiteral("inReplyTo")); | ||
174 | qCDebug(CMAKE) << "replying..." << inReplyTo; | 175 | qCDebug(CMAKE) << "replying..." << inReplyTo; | ||
Show All 31 Lines |