Merge remote-tracking branch 'origin/4.0'

Change-Id: Ied609608f6b12aa923c67777bc5a273c4d8fbcbb

src/libs/qmljs/qmljscheck.cpp

@@ -719,6 +719,10 @@ void Check::endVisit(UiObjectInitializer *)
 void Check::checkProperty(UiQualifiedId *qualifiedId)
 {
     const QString id = toString(qualifiedId);
+
+    if (id.isEmpty())
+        return;
+
     if (id.at(0).isLower()) {
         if (m_propertyStack.top().contains(id))
             addMessage(ErrPropertiesCanOnlyHaveOneBinding, fullLocationForQualifiedId(qualifiedId));

src/libs/qmljs/qmljsreformatter.cpp

@@ -533,6 +533,8 @@ protected:
         if (ast->type == UiPublicMember::Property) {
             if (ast->isDefaultMember)
                 out("default ", ast->defaultToken);
+            else if (ast->isReadonlyMember)
+                out("readonly ", ast->readonlyToken);
             out("property ", ast->propertyToken);
             if (!ast->typeModifier.isNull()) {
                 out(ast->typeModifierToken);