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

MacroExpander: Fix variable descriptions

Browse Source 
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:
Tobias Hunger
2015-09-17 11:49:45 +02:00
parent 897d3d6615
commit 39e8a3abf3
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/jsexpander.cpp
View File

@@ -87,7 +87,7 @@ JsExpander::JsExpander()
d = new Internal::JsExpanderPrivate; d = new Internal::JsExpanderPrivate;
Utils::globalMacroExpander()->registerPrefix("JS", Utils::globalMacroExpander()->registerPrefix("JS",
QCoreApplication::translate("Core::JsExpander", QCoreApplication::translate("Core::JsExpander",
"Evaluate simple Javascript statements.\n" "Evaluate simple Javascript statements.<br>"
"The statements may not contain '{' nor '}' characters."), "The statements may not contain '{' nor '}' characters."),
[this](QString in) -> QString { [this](QString in) -> QString {
QString errorMessage; QString errorMessage;

3
src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp
View File

@@ -56,7 +56,8 @@ JsonWizard::JsonWizard(QWidget *parent) :
*ret = stringValue(name); *ret = stringValue(name);
return !ret->isNull(); 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 [this](const QString &value) -> QString
{ {
const QString key = QString::fromLatin1("%{") + value + QLatin1Char('}'); const QString key = QString::fromLatin1("%{") + value + QLatin1Char('}');

4
src/plugins/qtsupport/qtsupportplugin.cpp
View File

@@ -119,8 +119,8 @@ void QtSupportPlugin::extensionsInitialized()
[]() { return qmakeProperty("QT_HOST_BINS"); }); []() { return qmakeProperty("QT_HOST_BINS"); });
expander->registerVariable(kInstallBins, expander->registerVariable(kInstallBins,
tr("Full path to the target bin directory of the current project's Qt version." 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)), "You probably want %1 instead.").arg(QString::fromLatin1(kHostBins)),
[]() { return qmakeProperty("QT_INSTALL_BINS"); }); []() { return qmakeProperty("QT_INSTALL_BINS"); });
} }