forked from qt-creator/qt-creator
MacroExpander: Fix variable descriptions
Task-number: QTCREATORBUG-15072 Change-Id: I176f2404509fd6be87dd8db98f5f1f5ef5e34dd6 Reviewed-by: hjk <hjk@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
This commit is contained in:
@@ -87,7 +87,7 @@ JsExpander::JsExpander()
|
||||
d = new Internal::JsExpanderPrivate;
|
||||
Utils::globalMacroExpander()->registerPrefix("JS",
|
||||
QCoreApplication::translate("Core::JsExpander",
|
||||
"Evaluate simple Javascript statements.\n"
|
||||
"Evaluate simple Javascript statements.<br>"
|
||||
"The statements may not contain '{' nor '}' characters."),
|
||||
[this](QString in) -> QString {
|
||||
QString errorMessage;
|
||||
|
@@ -56,7 +56,8 @@ JsonWizard::JsonWizard(QWidget *parent) :
|
||||
*ret = stringValue(name);
|
||||
return !ret->isNull();
|
||||
});
|
||||
m_expander.registerPrefix("Exists", tr("Check whether a variable exists. Returns \"true\" if it does and an empty string if not."),
|
||||
m_expander.registerPrefix("Exists", tr("Check whether a variable exists.<br>"
|
||||
"Returns \"true\" if it does and an empty string if not."),
|
||||
[this](const QString &value) -> QString
|
||||
{
|
||||
const QString key = QString::fromLatin1("%{") + value + QLatin1Char('}');
|
||||
|
@@ -119,8 +119,8 @@ void QtSupportPlugin::extensionsInitialized()
|
||||
[]() { return qmakeProperty("QT_HOST_BINS"); });
|
||||
|
||||
expander->registerVariable(kInstallBins,
|
||||
tr("Full path to the target bin directory of the current project's Qt version."
|
||||
" You probably want %1 instead.").arg(QString::fromLatin1(kHostBins)),
|
||||
tr("Full path to the target bin directory of the current project's Qt version.<br>"
|
||||
"You probably want %1 instead.").arg(QString::fromLatin1(kHostBins)),
|
||||
[]() { return qmakeProperty("QT_INSTALL_BINS"); });
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user