diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-12-02 18:42:05 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-12-02 18:42:05 +0100 |
| commit | 100ea30a1a5ccb0af4adafbf08b8fa89fe3c0ee7 (patch) | |
| tree | 0b2aca7b1533ac466e7d2312a6bd3fa1a0282ea1 /src/libs/clangbackendipc/ipcserverproxy.cpp | |
| parent | f86ebcbf22d7df6be60f1fc5c9f0f30a76e104d6 (diff) | |
| parent | e4be9edc4d538465338b8981294aa414a43b7255 (diff) | |
| download | qt-creator-100ea30a1a5ccb0af4adafbf08b8fa89fe3c0ee7.tar.gz | |
Merge remote-tracking branch 'origin/3.6'
Conflicts:
src/plugins/projectexplorer/toolchainmanager.cpp
src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
Change-Id: Id736c6922670c921c689219cb817b1541eaaf304
Diffstat (limited to 'src/libs/clangbackendipc/ipcserverproxy.cpp')
| -rw-r--r-- | src/libs/clangbackendipc/ipcserverproxy.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/libs/clangbackendipc/ipcserverproxy.cpp b/src/libs/clangbackendipc/ipcserverproxy.cpp index fa5777267c..90419da958 100644 --- a/src/libs/clangbackendipc/ipcserverproxy.cpp +++ b/src/libs/clangbackendipc/ipcserverproxy.cpp @@ -40,6 +40,7 @@ #include <ipcclientinterface.h> #include <registerunsavedfilesforeditormessage.h> #include <requestdiagnosticsmessage.h> +#include <requesthighlightingmessage.h> #include <unregisterunsavedfilesforeditormessage.h> #include <updatetranslationunitsforeditormessage.h> #include <updatevisibletranslationunitsmessage.h> @@ -120,6 +121,11 @@ void IpcServerProxy::requestDiagnostics(const ClangBackEnd::RequestDiagnosticsMe writeMessageBlock.write(QVariant::fromValue(message)); } +void IpcServerProxy::requestHighlighting(const RequestHighlightingMessage &message) +{ + writeMessageBlock.write(QVariant::fromValue(message)); +} + void IpcServerProxy::updateVisibleTranslationUnits(const UpdateVisibleTranslationUnitsMessage &message) { writeMessageBlock.write(QVariant::fromValue(message)); |