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/ipcserverinterface.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/ipcserverinterface.cpp')
| -rw-r--r-- | src/libs/clangbackendipc/ipcserverinterface.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libs/clangbackendipc/ipcserverinterface.cpp b/src/libs/clangbackendipc/ipcserverinterface.cpp index 93717dfa33..d25fee4525 100644 --- a/src/libs/clangbackendipc/ipcserverinterface.cpp +++ b/src/libs/clangbackendipc/ipcserverinterface.cpp @@ -37,6 +37,7 @@ #include "cmbunregistertranslationunitsforeditormessage.h" #include "registerunsavedfilesforeditormessage.h" #include "requestdiagnosticsmessage.h" +#include "requesthighlightingmessage.h" #include "unregisterunsavedfilesforeditormessage.h" #include "updatetranslationunitsforeditormessage.h" #include "updatevisibletranslationunitsmessage.h" @@ -58,9 +59,9 @@ void IpcServerInterface::dispatch(const QVariant &message) static const int unregisterUnsavedFilesForEditorMessageType = QMetaType::type("ClangBackEnd::UnregisterUnsavedFilesForEditorMessage"); static const int completeCodeMessageType = QMetaType::type("ClangBackEnd::CompleteCodeMessage"); static const int requestDiagnosticsMessageType = QMetaType::type("ClangBackEnd::RequestDiagnosticsMessage"); + static const int requestHighlightingTypeMessage = QMetaType::type("ClangBackEnd::RequestHighlightingMessage"); static const int updateVisibleTranslationUnitsMessageType = QMetaType::type("ClangBackEnd::UpdateVisibleTranslationUnitsMessage"); - int type = message.userType(); if (type == endMessageType) @@ -83,6 +84,8 @@ void IpcServerInterface::dispatch(const QVariant &message) completeCode(message.value<CompleteCodeMessage>()); else if (type == requestDiagnosticsMessageType) requestDiagnostics(message.value<RequestDiagnosticsMessage>()); + else if (type == requestHighlightingTypeMessage) + requestHighlighting(message.value<RequestHighlightingMessage>()); else if (type == updateVisibleTranslationUnitsMessageType) updateVisibleTranslationUnits(message.value<UpdateVisibleTranslationUnitsMessage>()); else |