aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qmlmin
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2012-12-11 22:24:29 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-11 14:50:32 +0100
commit0f5eec1e36ec1b61e0ff93b62245fb9377a26d6d (patch)
tree20d244ecfc0f1fd54d6d41ebb78e1fa2786c0e59 /tools/qmlmin
parente0f21c696a1f960d0e55f33eed9d1dc37d8edae0 (diff)
Fix invalid compression in qmlmin
qmlmin could compress identifiers in an invalid way if it contained special chars that would get expanded to unicode escape sequences Change-Id: I35b3ba01f68b69b34c4cd19616afb8b4b4cd6fa3 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'tools/qmlmin')
-rw-r--r--tools/qmlmin/main.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/tools/qmlmin/main.cpp b/tools/qmlmin/main.cpp
index 0d6950360f..9500c45915 100644
--- a/tools/qmlmin/main.cpp
+++ b/tools/qmlmin/main.cpp
@@ -352,13 +352,7 @@ bool Minify::parse(int startToken)
if (isIdentChar(lastChar))
assembled += QLatin1Char(' ');
- foreach (const QChar &ch, identifier) {
- if (isIdentChar(ch))
- assembled += ch;
- else {
- escape(ch, &assembled);
- }
- }
+ assembled += identifier;
} else if (yytoken == T_STRING_LITERAL || yytoken == T_MULTILINE_STRING_LITERAL) {
assembled += QLatin1Char('"');