diff --git a/src/plugins/coreplugin/fancyactionbar.cpp b/src/plugins/coreplugin/fancyactionbar.cpp index e7cb2e912bf..3546227435d 100644 --- a/src/plugins/coreplugin/fancyactionbar.cpp +++ b/src/plugins/coreplugin/fancyactionbar.cpp @@ -32,6 +32,8 @@ #include #include +#include +#include #include #include @@ -87,6 +89,12 @@ bool FancyToolButton::event(QEvent *e) animation->start(QAbstractAnimation::DeleteWhenStopped); } break; + case QEvent::ToolTip: + { + QHelpEvent *he = static_cast(e); + Utils::ToolTip::instance()->show(mapToGlobal(he->pos()), Utils::TextContent(toolTip()), this); + return true; + } default: return QToolButton::event(e); } diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp index 41aef002c36..865ab29911f 100644 --- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp +++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp @@ -1371,6 +1371,7 @@ void MiniProjectTargetSelector::mousePressEvent(QMouseEvent *e) void MiniProjectTargetSelector::updateActionAndSummary() { QString projectName; + QString fileName; // contains the path if projectName is not unique QString targetName; QString targetToolTipText; QString buildConfig; @@ -1381,6 +1382,12 @@ void MiniProjectTargetSelector::updateActionAndSummary() Project *project = ProjectExplorerPlugin::instance()->startupProject(); if (project) { projectName = project->displayName(); + foreach (Project *p, ProjectExplorerPlugin::instance()->session()->projects()) { + if (p != project && p->displayName() == projectName) { + fileName = project->document()->fileName(); + break; + } + } if (Target *target = project->activeTarget()) { targetName = project->activeTarget()->displayName(); @@ -1406,6 +1413,8 @@ void MiniProjectTargetSelector::updateActionAndSummary() m_projectAction->setIcon(targetIcon); QStringList lines; lines << tr("Project: %1").arg(projectName); + if (!fileName.isEmpty()) + lines << tr("Path: %1").arg(fileName); if (!targetName.isEmpty()) lines << tr("Kit: %1").arg(targetName); if (!buildConfig.isEmpty())