From 39e8a3abf3d114a2f688d0f98d3c894af5913a78 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 17 Sep 2015 11:49:45 +0200 Subject: [PATCH] MacroExpander: Fix variable descriptions Task-number: QTCREATORBUG-15072 Change-Id: I176f2404509fd6be87dd8db98f5f1f5ef5e34dd6 Reviewed-by: hjk Reviewed-by: Leena Miettinen --- src/plugins/coreplugin/jsexpander.cpp | 2 +- src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp | 3 ++- src/plugins/qtsupport/qtsupportplugin.cpp | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/plugins/coreplugin/jsexpander.cpp b/src/plugins/coreplugin/jsexpander.cpp index 10db6a8c8b7..9ac707a964d 100644 --- a/src/plugins/coreplugin/jsexpander.cpp +++ b/src/plugins/coreplugin/jsexpander.cpp @@ -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.
" "The statements may not contain '{' nor '}' characters."), [this](QString in) -> QString { QString errorMessage; diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp index f8cb87263f6..2693271b5c8 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp @@ -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.
" + "Returns \"true\" if it does and an empty string if not."), [this](const QString &value) -> QString { const QString key = QString::fromLatin1("%{") + value + QLatin1Char('}'); diff --git a/src/plugins/qtsupport/qtsupportplugin.cpp b/src/plugins/qtsupport/qtsupportplugin.cpp index fd7ba562f9b..868926b2715 100644 --- a/src/plugins/qtsupport/qtsupportplugin.cpp +++ b/src/plugins/qtsupport/qtsupportplugin.cpp @@ -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.
" + "You probably want %1 instead.").arg(QString::fromLatin1(kHostBins)), []() { return qmakeProperty("QT_INSTALL_BINS"); }); }