Merge remote-tracking branch 'origin/5.8.0' into 5.8

Change-Id: I19804e880005c66880eeabfaebf0b1093de80e6b

1 files changed, 5 insertions, 5 deletions

diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp
index eb83962630..c0f953ca2c 100644
--- a/src/qml/compiler/qqmlirbuilder.cpp
+++ b/src/qml/compiler/qqmlirbuilder.cpp
@@ -757,7 +757,7 @@ bool IRBuilder::visit(QQmlJS::AST::UiPublicMember *node)
 
         QQmlJS::AST::UiParameterList *p = node->parameters;
         while (p) {
-            const QStringRef &memberType = p->type;
+            const QString memberType = asString(p->type);
 
             if (memberType.isEmpty()) {
                 recordError(node->typeToken, QCoreApplication::translate("QQmlParser","Expected parameter type"));
@@ -780,10 +780,10 @@ bool IRBuilder::visit(QQmlJS::AST::UiPublicMember *node)
                     // Must be a QML object type.
                     // Lazily determine type during compilation.
                     param->type = QV4::CompiledData::Property::Custom;
-                    param->customTypeNameIndex = registerString(p->type.toString());
+                    param->customTypeNameIndex = registerString(memberType);
                 } else {
                     QString errStr = QCoreApplication::translate("QQmlParser","Invalid signal parameter type: ");
-                    errStr.append(memberType.toString());
+                    errStr.append(memberType);
                     recordError(node->typeToken, errStr);
                     return false;
                 }
@@ -812,7 +812,7 @@ bool IRBuilder::visit(QQmlJS::AST::UiPublicMember *node)
             return false;
         }
     } else {
-        const QStringRef &memberType = node->memberType;
+        QString memberType = asString(node->memberType);
         if (memberType == QLatin1String("alias")) {
             return appendAlias(node);
         } else {
@@ -857,7 +857,7 @@ bool IRBuilder::visit(QQmlJS::AST::UiPublicMember *node)
                 property->flags |= QV4::CompiledData::Property::IsReadOnly;
             property->type = type;
             if (type >= QV4::CompiledData::Property::Custom)
-                property->customTypeNameIndex = registerString(memberType.toString());
+                property->customTypeNameIndex = registerString(memberType);
             else
                 property->customTypeNameIndex = emptyStringIndex;