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

CMake: forward dirty signal in server-mode

Browse Source 
This fixes auto-running cmake on changes to the project files.

Change-Id: I652b48b243b5decb6927b1619c47527af83d7f03
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2017-03-13 14:32:12 +01:00
parent c05222c8e7
commit 98505427d3
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,6 +95,8 @@ void ServerModeReader::setParameters(const BuildDirReader::Parameters &p)
this, &ServerModeReader::handleError); this, &ServerModeReader::handleError);
connect(m_cmakeServer.get(), &ServerMode::cmakeProgress, connect(m_cmakeServer.get(), &ServerMode::cmakeProgress,
this, &ServerModeReader::handleProgress); this, &ServerModeReader::handleProgress);
connect(m_cmakeServer.get(), &ServerMode::cmakeSignal,
this, &ServerModeReader::handleSignal);
connect(m_cmakeServer.get(), &ServerMode::cmakeMessage, connect(m_cmakeServer.get(), &ServerMode::cmakeMessage,
this, [this](const QString &m) { Core::MessageManager::write(m); }); this, [this](const QString &m) { Core::MessageManager::write(m); });
connect(m_cmakeServer.get(), &ServerMode::message, connect(m_cmakeServer.get(), &ServerMode::message,
@@ -387,6 +389,13 @@ void ServerModeReader::handleProgress(int min, int cur, int max, const QString &
m_future->setProgressValue(progress); m_future->setProgressValue(progress);
} }
void ServerModeReader::handleSignal(const QString &signal, const QVariantMap &data)
{
Q_UNUSED(data);
if (signal == "dirty")
emit dirty();
}
void ServerModeReader::extractCodeModelData(const QVariantMap &data) void ServerModeReader::extractCodeModelData(const QVariantMap &data)
{ {
const QVariantList configs = data.value("configurations").toList(); const QVariantList configs = data.value("configurations").toList();

1
src/plugins/cmakeprojectmanager/servermodereader.h
View File

@@ -62,6 +62,7 @@ private:
void handleReply(const QVariantMap &data, const QString &inReplyTo); void handleReply(const QVariantMap &data, const QString &inReplyTo);
void handleError(const QString &message); void handleError(const QString &message);
void handleProgress(int min, int cur, int max, const QString &inReplyTo); void handleProgress(int min, int cur, int max, const QString &inReplyTo);
void handleSignal(const QString &signal, const QVariantMap &data);
struct Target; struct Target;
struct Project; struct Project;