diff --git a/src/plugins/qmldesigner/core/filemanager/astobjecttextextractor.cpp b/src/plugins/qmldesigner/core/filemanager/astobjecttextextractor.cpp
index 8b5d4ad9649dce81ab1dd6c253d4e12b243cb2ff..004f29a4eab3d808b057e168a064173d64f5f74f 100644
--- a/src/plugins/qmldesigner/core/filemanager/astobjecttextextractor.cpp
+++ b/src/plugins/qmldesigner/core/filemanager/astobjecttextextractor.cpp
@@ -39,7 +39,7 @@ ASTObjectTextExtractor::ASTObjectTextExtractor(const QString &text):
         m_document(QmlDocument::create("<ASTObjectTextExtractor>"))
 {
     m_document->setSource(text);
-    m_document->parse();
+    m_document->parseQml();
 }
 
 QString ASTObjectTextExtractor::operator ()(int location)
@@ -49,7 +49,7 @@ QString ASTObjectTextExtractor::operator ()(int location)
     m_location = location;
     m_text.clear();
 
-    Node::accept(m_document->program(), this);
+    Node::accept(m_document->qmlProgram(), this);
 
     return m_text;
 }
diff --git a/src/plugins/qmldesigner/core/filemanager/firstdefinitionfinder.cpp b/src/plugins/qmldesigner/core/filemanager/firstdefinitionfinder.cpp
index 3063d821cf5702b5da4e937375d764e07cdb2063..27feb2fcada91207a94d02590c2a23c6a46b6f46 100644
--- a/src/plugins/qmldesigner/core/filemanager/firstdefinitionfinder.cpp
+++ b/src/plugins/qmldesigner/core/filemanager/firstdefinitionfinder.cpp
@@ -39,7 +39,7 @@ FirstDefinitionFinder::FirstDefinitionFinder(const QString &text):
         m_doc(QmlDocument::create("<internal>"))
 {
     m_doc->setSource(text);
-    bool ok = m_doc->parse();
+    bool ok = m_doc->parseQml();
 
     Q_ASSERT(ok);
 }
@@ -56,7 +56,7 @@ quint32 FirstDefinitionFinder::operator()(quint32 offset)
     m_offset = offset;
     m_firstObjectDefinition = 0;
 
-    Node::accept(m_doc->program(), this);
+    Node::accept(m_doc->qmlProgram(), this);
 
     return m_firstObjectDefinition->firstSourceLocation().offset;
 }
diff --git a/src/plugins/qmldesigner/core/filemanager/objectlengthcalculator.cpp b/src/plugins/qmldesigner/core/filemanager/objectlengthcalculator.cpp
index 88dbe6d1db430527694bafa765608a9bd6822cac..a0c8b9255ff454f61b547e6d28bd6c05b6b16f62 100644
--- a/src/plugins/qmldesigner/core/filemanager/objectlengthcalculator.cpp
+++ b/src/plugins/qmldesigner/core/filemanager/objectlengthcalculator.cpp
@@ -39,7 +39,7 @@ ObjectLengthCalculator::ObjectLengthCalculator(const QString &text):
         m_doc(QmlDocument::create("<internal>"))
 {
     m_doc->setSource(text);
-    bool ok = m_doc->parse();
+    bool ok = m_doc->parseQml();
 
     Q_ASSERT(ok);
 }
@@ -49,7 +49,7 @@ quint32 ObjectLengthCalculator::operator()(quint32 offset)
     m_offset = offset;
     m_length = 0;
 
-    Node::accept(m_doc->program(), this);
+    Node::accept(m_doc->qmlProgram(), this);
 
     return m_length;
 }
diff --git a/src/plugins/qmldesigner/core/filemanager/qmlrefactoring.cpp b/src/plugins/qmldesigner/core/filemanager/qmlrefactoring.cpp
index 9a97350cdf17b38e1d31d944c1c954db8d35cfd9..aaac26b08d40d0c0cb54348f8c5bd6ea60b9d05a 100644
--- a/src/plugins/qmldesigner/core/filemanager/qmlrefactoring.cpp
+++ b/src/plugins/qmldesigner/core/filemanager/qmlrefactoring.cpp
@@ -60,7 +60,7 @@ bool QmlRefactoring::reparseDocument()
     QmlDocument::Ptr tmpDocument(QmlDocument::create("<ModelToTextMerger>"));
     tmpDocument->setSource(newSource);
 
-    if (tmpDocument->parse()) {
+    if (tmpDocument->parseQml()) {
         qmlDocument = tmpDocument;
         return true;
     } else {
@@ -83,7 +83,7 @@ bool QmlRefactoring::addToArrayMemberList(int parentLocation, const QString &pro
 
     AddArrayMemberVisitor visit(*textModifier, (quint32) parentLocation, propertyName, content);
     visit.setConvertObjectBindingIntoArrayBinding(true);
-    return visit(qmlDocument->program());
+    return visit(qmlDocument->qmlProgram());
 }
 
 bool QmlRefactoring::addToObjectMemberList(int parentLocation, const QString &content)
@@ -91,7 +91,7 @@ bool QmlRefactoring::addToObjectMemberList(int parentLocation, const QString &co
     Q_ASSERT(parentLocation >= 0);
 
     AddObjectVisitor visit(*textModifier, (quint32) parentLocation, content, m_propertyOrder);
-    return visit(qmlDocument->program());
+    return visit(qmlDocument->qmlProgram());
 }
 
 bool QmlRefactoring::addProperty(int parentLocation, const QString &name, const QString &value, PropertyType propertyType)
@@ -99,7 +99,7 @@ bool QmlRefactoring::addProperty(int parentLocation, const QString &name, const
     Q_ASSERT(parentLocation >= 0);
 
     AddPropertyVisitor visit(*textModifier, (quint32) parentLocation, name, value, propertyType, m_propertyOrder);
-    return visit(qmlDocument->program());
+    return visit(qmlDocument->qmlProgram());
 }
 
 bool QmlRefactoring::changeProperty(int parentLocation, const QString &name, const QString &value, PropertyType propertyType)
@@ -107,7 +107,7 @@ bool QmlRefactoring::changeProperty(int parentLocation, const QString &name, con
     Q_ASSERT(parentLocation >= 0);
 
     ChangePropertyVisitor visit(*textModifier, (quint32) parentLocation, name, value, propertyType);
-    return visit(qmlDocument->program());
+    return visit(qmlDocument->qmlProgram());
 }
 
 bool QmlRefactoring::changeObjectType(int nodeLocation, const QString &newType)
@@ -116,7 +116,7 @@ bool QmlRefactoring::changeObjectType(int nodeLocation, const QString &newType)
     Q_ASSERT(!newType.isEmpty());
 
     ChangeObjectTypeVisitor visit(*textModifier, (quint32) nodeLocation, newType);
-    return visit(qmlDocument->program());
+    return visit(qmlDocument->qmlProgram());
 }
 
 bool QmlRefactoring::moveObject(int objectLocation, const QString &targetPropertyName, bool targetIsArrayBinding, int targetParentObjectLocation)
@@ -125,7 +125,7 @@ bool QmlRefactoring::moveObject(int objectLocation, const QString &targetPropert
     Q_ASSERT(targetParentObjectLocation >= 0);
 
     MoveObjectVisitor visit(*textModifier, (quint32) objectLocation, targetPropertyName, targetIsArrayBinding, (quint32) targetParentObjectLocation, m_propertyOrder);
-    return visit(qmlDocument->program());
+    return visit(qmlDocument->qmlProgram());
 }
 
 bool QmlRefactoring::moveObjectBeforeObject(int movingObjectLocation, int beforeObjectLocation)
@@ -135,10 +135,10 @@ bool QmlRefactoring::moveObjectBeforeObject(int movingObjectLocation, int before
 
     if (beforeObjectLocation == -1) {
         MoveObjectBeforeObjectVisitor visit(*textModifier, movingObjectLocation);
-        return visit(qmlDocument->program());
+        return visit(qmlDocument->qmlProgram());
     } else {
         MoveObjectBeforeObjectVisitor visit(*textModifier, movingObjectLocation, beforeObjectLocation);
-        return visit(qmlDocument->program());
+        return visit(qmlDocument->qmlProgram());
     }
     return false;
 }
@@ -148,7 +148,7 @@ bool QmlRefactoring::removeObject(int nodeLocation)
     Q_ASSERT(nodeLocation >= 0);
 
     RemoveUIObjectMemberVisitor visit(*textModifier, (quint32) nodeLocation);
-    return visit(qmlDocument->program());
+    return visit(qmlDocument->qmlProgram());
 }
 
 bool QmlRefactoring::removeProperty(int parentLocation, const QString &name)
@@ -157,5 +157,5 @@ bool QmlRefactoring::removeProperty(int parentLocation, const QString &name)
     Q_ASSERT(!name.isEmpty());
 
     RemovePropertyVisitor visit(*textModifier, (quint32) parentLocation, name);
-    return visit(qmlDocument->program());
+    return visit(qmlDocument->qmlProgram());
 }
diff --git a/src/plugins/qmldesigner/core/model/modeltotextmerger.cpp b/src/plugins/qmldesigner/core/model/modeltotextmerger.cpp
index 16947a495acf3084dc927665147c284829ca8bd0..894d92008b9e5a30164e18f81dbbc320777bb27a 100644
--- a/src/plugins/qmldesigner/core/model/modeltotextmerger.cpp
+++ b/src/plugins/qmldesigner/core/model/modeltotextmerger.cpp
@@ -198,7 +198,7 @@ void ModelToTextMerger::applyChanges()
 
     QmlDocument::Ptr tmpDocument(QmlDocument::create(QLatin1String("<ModelToTextMerger>")));
     tmpDocument->setSource(m_rewriterView->textModifier()->text());
-    if (!tmpDocument->parse()) {
+    if (!tmpDocument->parseQml()) {
         qDebug() << "*** Possible problem: QML file wasn't parsed correctly.";
         qDebug() << "*** QML text:" << m_rewriterView->textModifier()->text();
         return;