debugger: remove hard dependency on cppeditor

src/plugins/debugger/Debugger.pluginspec.in

@@ -14,10 +14,11 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>Debugger integration.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name=\"CppEditor\" version=\"$$QTCREATOR_VERSION\"/><!-- Debugger plugin adds items to the editor's context menu -->
         <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
         <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
         <dependency name=\"Find\" version=\"$$QTCREATOR_VERSION\"/>
+        <!-- Debugger plugin adds items to the editor's context menu -->
+        <dependency name=\"CppEditor\" version=\"$$QTCREATOR_VERSION\" type=\"soft\"/>
     </dependencyList>
     <argumentList>
         <argument name=\"-disable-cdb\">Disable Cdb debugger engine</argument>

src/plugins/debugger/debuggerplugin.cpp

@@ -2995,20 +2995,21 @@ void DebuggerPluginPrivate::extensionsInitialized()
     //cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+D,Ctrl+W")));
     debugMenu->addAction(cmd);
 
+    // If the CppEditor plugin is there, we want to add something to
+    // the editor context menu.
+    if (ActionContainer *editorContextMenu =
+            am->actionContainer(CppEditor::Constants::M_CONTEXT)) {
+        cmd = am->registerAction(sep, _("Debugger.Sep.Views"),
+            cppDebuggercontext);
+        editorContextMenu->addAction(cmd);
+        cmd->setAttribute(Command::CA_Hide);
 
-    // Editor context menu
-    ActionContainer *editorContextMenu =
-        am->actionContainer(CppEditor::Constants::M_CONTEXT);
-    cmd = am->registerAction(sep, _("Debugger.Sep.Views"),
-        cppDebuggercontext);
-    editorContextMenu->addAction(cmd);
-    cmd->setAttribute(Command::CA_Hide);
-
-    cmd = am->registerAction(m_actions.watchAction2,
-        Constants::ADD_TO_WATCH2, cppDebuggercontext);
-    cmd->action()->setEnabled(true);
-    editorContextMenu->addAction(cmd);
-    cmd->setAttribute(Command::CA_Hide);
+        cmd = am->registerAction(m_actions.watchAction2,
+            Constants::ADD_TO_WATCH2, cppDebuggercontext);
+        cmd->action()->setEnabled(true);
+        editorContextMenu->addAction(cmd);
+        cmd->setAttribute(Command::CA_Hide);
+    }
 
     m_plugin->addAutoReleasedObject(new CommonOptionsPage);
     QList<Core::IOptionsPage *> engineOptionPages;

src/plugins/plugins.pro

@@ -152,7 +152,6 @@ plugin_bookmarks.depends += plugin_texteditor
 plugin_debugger.subdir = debugger
 plugin_debugger.depends = plugin_projectexplorer
 plugin_debugger.depends += plugin_coreplugin
-plugin_debugger.depends += plugin_cppeditor
 
 plugin_fakevim.subdir = fakevim
 plugin_fakevim.depends = plugin_coreplugin