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

Merge remote-tracking branch 'origin/2.8'

Browse Source 
Conflicts:
	src/libs/extensionsystem/pluginmanager.cpp
	src/libs/extensionsystem/pluginspec.cpp
	src/plugins/coreplugin/basefilewizard.cpp
	src/plugins/coreplugin/coreplugin.pro
	src/plugins/coreplugin/coreplugin.qbs
	src/plugins/coreplugin/editormanager/ieditor.cpp
	src/plugins/coreplugin/externaltool.cpp
	src/plugins/coreplugin/icore.cpp
	src/plugins/cpptools/cppmodelmanager.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	src/plugins/find/ifindfilter.cpp
	src/plugins/projectexplorer/buildstep.cpp
	src/plugins/projectexplorer/devicesupport/idevice.cpp
	src/plugins/projectexplorer/runconfiguration.cpp
	src/plugins/vcsbase/vcsbaseeditor.cpp
	tests/system/suite_debugger/tst_simple_analyze/test.py

Change-Id: I11dc9e60bfc14bad4f8af747d041fc7678a07c17
This commit is contained in:
Eike Ziller
2013-09-27 10:44:32 +02:00
parent 19c735a491 a12a9f491c
commit 63ff745213
133 changed files with 1386 additions and 1326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/projectexplorer/customwizard/customwizardpreprocessor.cpp
View File

@@ -260,9 +260,9 @@ bool PreprocessContext::process(const QString &in, QString *out, QString *errorM
}
/*!
\brief Custom wizard preprocessor based on JavaScript expressions.
Implements a custom wizard preprocessor based on JavaScript expressions.
Preprocess a string using simple syntax:
Preprocesses a string using a simple syntax:
\code
Text
@if <JavaScript-expression>
@@ -274,7 +274,7 @@ Blup
The JavaScript-expressions must evaluate to integers or boolean, like
\c '2 == 1 + 1', \c '"a" == "a"'. The variables of the custom wizard will be
expanded before, so , \c "%VAR%" should be used for strings and \c %VAR% for integers.
expanded before, so \c "%VAR%" should be used for strings and \c %VAR% for integers.
\sa ProjectExplorer::CustomWizard
*/