diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-05-31 15:29:05 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-06-03 06:46:52 +0000 |
| commit | 23c222f61b260b56c10775197d6100f130d558b4 (patch) | |
| tree | 513c9d0f65d9f7f9ec4884c64db7f92f858beaa2 /src/libs/utils/stringutils.cpp | |
| parent | d73c27125952bcce920a2abd55c7c3758e850ac0 (diff) | |
Fix C++ Library wizard when compiled with Qt < 5.12
Only Qt 5.12 got true ECMA Script capabilities, so arrow function
expressions are not supported before that.
To be able to use "regular" inline functions, we allow usage of } by escaping with backslash.
For variables that do not start with "JS:" we already supported backslash for escaping.
Fixes: QTCREATORBUG-22336
Change-Id: I9fc638e64d2757a21fffc16355635e2fcff87a36
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/libs/utils/stringutils.cpp')
| -rw-r--r-- | src/libs/utils/stringutils.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/utils/stringutils.cpp b/src/libs/utils/stringutils.cpp index b39af367d59..161cf44e740 100644 --- a/src/libs/utils/stringutils.cpp +++ b/src/libs/utils/stringutils.cpp @@ -143,7 +143,7 @@ bool AbstractMacroExpander::expandNestedMacros(const QString &str, int *pos, QSt varName.reserve(strLen - i); for (; i < strLen; prev = c) { c = str.at(i++); - if (c == '\\' && i < strLen && validateVarName(varName)) { + if (c == '\\' && i < strLen) { c = str.at(i++); // For the replacement, do not skip the escape sequence when followed by a digit. // This is needed for enabling convenient capture group replacement, |