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

QmlDesigner: Write single non ASCII chars as escaped unicode

Browse Source 
We do not know if the string was escaped or not in the model.
But this heuristic at least improves the issue
and single characters are escaped.

Task-number: QTCREATORBUG-12616
Change-Id: I3dcc251ce111ab3ee377a17876e2cdb64162d6e8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2016-10-11 16:21:42 +02:00
committed by Tim Jenssen
parent 4dffc26cd1
commit c4417c49c7
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp
View File

@@ -61,6 +61,23 @@ inline static QString doubleToString(double d)
return string;
}
static QString unicodeEscape(const QString &stringValue)
{
if (stringValue.count() == 1) {
ushort code = stringValue.at(0).unicode();
bool isUnicode = code <= 127;
if (isUnicode) {
return stringValue;
} else {
QString escaped;
escaped += "\\u";
escaped += QString::number(code, 16).rightJustified(4, '0');
return escaped;
}
}
return stringValue;
}
QmlTextGenerator::QmlTextGenerator(const PropertyNameList &propertyOrder, int indentDepth):
m_propertyOrder(propertyOrder),
m_indentDepth(indentDepth)
@@ -131,7 +148,9 @@ QString QmlTextGenerator::toQml(const AbstractProperty &property, int indentDept
case QMetaType::UInt:
case QMetaType::ULongLong:
return stringValue;
case QMetaType::QString:
case QMetaType::QChar:
return QStringLiteral("\"%1\"").arg(escape(unicodeEscape(stringValue)));
default:
return QStringLiteral("\"%1\"").arg(escape(stringValue));
}