Merge remote-tracking branch 'origin/4.12'

 Conflicts:
	src/tools/qml2puppet/CMakeLists.txt

Change-Id: Id6243b0f725a68075d789bf35e771113b742645b

4 files changed, 19 insertions, 2 deletions

diff --git a/src/plugins/clangtools/CMakeLists.txt b/src/plugins/clangtools/CMakeLists.txt
index 88b25830d7..9831046b5f 100644
--- a/src/plugins/clangtools/CMakeLists.txt
+++ b/src/plugins/clangtools/CMakeLists.txt
@@ -8,6 +8,7 @@ add_qtc_plugin(ClangTools
   CONDITION TARGET libclang AND TARGET yaml-cpp
   DEPENDS ClangSupport libclang yaml-cpp
   PLUGIN_DEPENDS Core Debugger CppTools ${TST_COMPONENT}
+  PLUGIN_RECOMMENDS CppEditor
   INCLUDES ${CLANG_INCLUDE_DIRS}
   SOURCES
     clangfileinfo.h
diff --git a/src/plugins/clangtools/clangtools.qbs b/src/plugins/clangtools/clangtools.qbs
index d25707c562..07ec6201b1 100644
--- a/src/plugins/clangtools/clangtools.qbs
+++ b/src/plugins/clangtools/clangtools.qbs
@@ -18,6 +18,10 @@ QtcPlugin {
 
     Depends { name: "Qt.widgets" }
 
+    pluginRecommends: [
+        "CppEditor"
+    ]
+
     pluginTestDepends: [
         "QbsProjectManager",
         "QmakeProjectManager",
diff --git a/src/plugins/clangtools/clangtools_dependencies.pri b/src/plugins/clangtools/clangtools_dependencies.pri
index 943ca17936..eaaaf29515 100644
--- a/src/plugins/clangtools/clangtools_dependencies.pri
+++ b/src/plugins/clangtools/clangtools_dependencies.pri
@@ -9,6 +9,8 @@ isEmpty(EXTERNAL_YAML_CPP_FOUND): QTC_LIB_DEPENDS += yaml-cpp
 QTC_PLUGIN_DEPENDS += \
     debugger \
     cpptools
+QTC_PLUGIN_RECOMMENDS += \
+    cppeditor
 QTC_TEST_DEPENDS += \
     qbsprojectmanager \
     qmakeprojectmanager
diff --git a/src/plugins/clangtools/clangtoolsplugin.cpp b/src/plugins/clangtools/clangtoolsplugin.cpp
index 6d9e8b8aa5..eb1d73663e 100644
--- a/src/plugins/clangtools/clangtoolsplugin.cpp
+++ b/src/plugins/clangtools/clangtoolsplugin.cpp
@@ -48,6 +48,8 @@
 #include <cpptools/cpptoolsconstants.h>
 #include <cpptools/cppmodelmanager.h>
 
+#include <cppeditor/cppeditorconstants.h>
+
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/projectpanelfactory.h>
 #include <projectexplorer/target.h>
@@ -95,8 +97,16 @@ bool ClangToolsPlugin::initialize(const QStringList &arguments, QString *errorSt
     d = new ClangToolsPluginPrivate;
 
     ActionManager::registerAction(d->clangTool.startAction(), Constants::RUN_ON_PROJECT);
-    ActionManager::registerAction(d->clangTool.startOnCurrentFileAction(),
-                                  Constants::RUN_ON_CURRENT_FILE);
+    Command *cmd = ActionManager::registerAction(d->clangTool.startOnCurrentFileAction(),
+                                                 Constants::RUN_ON_CURRENT_FILE);
+    ActionContainer *mtoolscpp = ActionManager::actionContainer(CppTools::Constants::M_TOOLS_CPP);
+    if (mtoolscpp)
+        mtoolscpp->addAction(cmd);
+
+    Core::ActionContainer *mcontext = Core::ActionManager::actionContainer(
+        CppEditor::Constants::M_CONTEXT);
+    if (mcontext)
+        mcontext->addAction(cmd, CppEditor::Constants::G_CONTEXT_FIRST); // TODO
 
     auto panelFactory = m_projectPanelFactoryInstance = new ProjectPanelFactory;
     panelFactory->setPriority(100);