feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

VariableManager: Do not try to expand Prefixes

Browse Source 
Resolving "Prefix:<value>" does not make any sense, so let's not
do that.

Task-number: QTCREATORBUG-15072
Change-Id: Ia9741f9b48d269a7be31163ad73c3bc232856419
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-09-17 13:48:02 +02:00
parent 39e8a3abf3
commit 3f1b622fb7
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/coreplugin/variablechooser.cpp
View File

@@ -177,8 +177,11 @@ public:
}
if (role == Qt::ToolTipRole) {
QString description = m_expander->variableDescription(m_variable.toUtf8());
const QString value = m_expander->value(m_variable.toUtf8()).toHtmlEscaped();
const QByteArray var = m_variable.toUtf8();
QString description = m_expander->variableDescription(var);
QString value;
if (!m_expander->isPrefixVariable(var))
value = m_expander->value(var).toHtmlEscaped();
if (!value.isEmpty())
description += QLatin1String("<p>") + VariableChooser::tr("Current Value: %1").arg(value);
return description;