Merge remote-tracking branch 'origin/11.0'

Change-Id: I87b22a73427cf9fc1b96075dc0db769ed3d3621c

1 files changed, 2 insertions, 2 deletions

diff --git a/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp b/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp
index c283bf5b269..af9b6a24252 100644
--- a/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp
@@ -49,7 +49,7 @@ inline static QString doubleToString(const PropertyName &propertyName, double d)
 
 static QString unicodeEscape(const QString &stringValue)
 {
-    if (stringValue.count() == 1) {
+    if (stringValue.size() == 1) {
         ushort code = stringValue.at(0).unicode();
         bool isUnicode = code <= 127;
         if (isUnicode) {
@@ -289,7 +289,7 @@ QString QmlTextGenerator::escape(const QString &value)
 {
     QString result = value;
 
-    if (value.count() == 6 && value.startsWith("\\u")) //Do not dobule escape unicode chars
+    if (value.size() == 6 && value.startsWith("\\u")) //Do not dobule escape unicode chars
         return result;
 
     result.replace(QStringLiteral("\\"), QStringLiteral("\\\\"));