3 files changed, 20 insertions, 5 deletions
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 0604edde96..fe072bde82 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -518,6 +518,7 @@ CPPEditorWidget::CPPEditorWidget(QWidget *parent)
     , m_objcEnabled(false)
     , m_commentsSettings(CppTools::CppToolsSettings::instance()->commentsSettings())
     , m_followSymbolUnderCursor(new FollowSymbolUnderCursor(this))
+    , m_preprocessorButton(0)
 {
     qRegisterMetaType<SemanticInfo>("CppTools::SemanticInfo");
 
@@ -647,10 +648,13 @@ void CPPEditorWidget::createToolBar(CPPEditor *editor)
     connect(this, SIGNAL(cursorPositionChanged()), this, SLOT(updateUses()));
     connect(this, SIGNAL(textChanged()), this, SLOT(updateUses()));
 
-    QToolButton *hashButton = new QToolButton(this);
-    hashButton->setText(QLatin1String("#"));
-    connect(hashButton, SIGNAL(clicked()), this, SLOT(showPreProcessorWidget()));
-    editor->insertExtraToolBarWidget(TextEditor::BaseTextEditor::Left, hashButton);
+    m_preprocessorButton = new QToolButton(this);
+    m_preprocessorButton->setText(QLatin1String("#"));
+    Core::Command *cmd = Core::ActionManager::command(Constants::OPEN_PREPROCESSOR_DIALOG);
+    connect(cmd, SIGNAL(keySequenceChanged()), this, SLOT(updatePreprocessorButtonTooltip()));
+    updatePreprocessorButtonTooltip();
+    connect(m_preprocessorButton, SIGNAL(clicked()), this, SLOT(showPreProcessorWidget()));
+    editor->insertExtraToolBarWidget(TextEditor::BaseTextEditor::Left, m_preprocessorButton);
     editor->insertExtraToolBarWidget(TextEditor::BaseTextEditor::Left, m_outlineCombo);
 }
 
@@ -1012,6 +1016,14 @@ void CPPEditorWidget::onContentsChanged(int position, int charsRemoved, int char
         updateUses();
 }
 
+void CPPEditorWidget::updatePreprocessorButtonTooltip()
+{
+    QTC_ASSERT(m_preprocessorButton, return);
+    Core::Command *cmd = Core::ActionManager::command(Constants::OPEN_PREPROCESSOR_DIALOG);
+    QTC_ASSERT(cmd, return);
+    m_preprocessorButton->setToolTip(cmd->action()->toolTip());
+}
+
 void CPPEditorWidget::jumpToOutlineElement(int index)
 {
     QModelIndex modelIndex = m_outlineCombo->view()->currentIndex();
diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h
index ae1f57e31b..5546a20fae 100644
--- a/src/plugins/cppeditor/cppeditor.h
+++ b/src/plugins/cppeditor/cppeditor.h
@@ -50,6 +50,7 @@
 QT_BEGIN_NAMESPACE
 class QComboBox;
 class QSortFilterProxyModel;
+class QToolButton;
 QT_END_NAMESPACE
 
 namespace CPlusPlus {
@@ -175,6 +176,7 @@ private Q_SLOTS:
     void onFunctionDeclDefLinkFound(QSharedPointer<FunctionDeclDefLink> link);
     void onDocumentUpdated();
     void onContentsChanged(int position, int charsRemoved, int charsAdded);
+    void updatePreprocessorButtonTooltip();
 
     void updateSemanticInfo(const CppTools::SemanticInfo &semanticInfo);
     void highlightSymbolUsages(int from, int to);
@@ -259,6 +261,7 @@ private:
 
     QScopedPointer<FollowSymbolUnderCursor> m_followSymbolUnderCursor;
     QString m_preProcessorAdditions;
+    QToolButton *m_preprocessorButton;
 };
 
 } // namespace Internal
diff --git a/src/plugins/cppeditor/cppeditorplugin.cpp b/src/plugins/cppeditor/cppeditorplugin.cpp
index b9c66de4a1..d7dd630a43 100644
--- a/src/plugins/cppeditor/cppeditorplugin.cpp
+++ b/src/plugins/cppeditor/cppeditorplugin.cpp
@@ -210,7 +210,7 @@ bool CppEditorPlugin::initialize(const QStringList & /*arguments*/, QString *err
     contextMenu->addAction(cmd);
     cppToolsMenu->addAction(cmd);
 
-    QAction *openPreprocessorDialog = new QAction(tr("Additional Preprocessor Directives"), this);
+    QAction *openPreprocessorDialog = new QAction(tr("Additional Preprocessor Directives..."), this);
     cmd = ActionManager::registerAction(openPreprocessorDialog,
                                         Constants::OPEN_PREPROCESSOR_DIALOG, context);
     cmd->setDefaultKeySequence(QKeySequence());