diff --git a/src/tools/qmldesigner/standalone/standalone.pro b/src/tools/qmldesigner/standalone/standalone.pro
index 9bc191991af5503dcc01e229bbabcadbd3d69e3f..9c574f855f816b472ad71345d53453ab708e33d3 100644
--- a/src/tools/qmldesigner/standalone/standalone.pro
+++ b/src/tools/qmldesigner/standalone/standalone.pro
@@ -23,7 +23,7 @@ SOURCES += \
     application.cpp \
     welcomescreen.cpp
 
-include(../../../shared/qmljs/qmljs.pri)
+include(../../../libs/qmljs/qmljs-lib.pri)
 HEADERS+=../../../libs/utils/changeset.h
 SOURCES+=../../../libs/utils/changeset.cpp
 INCLUDEPATH+=../../../libs
diff --git a/tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro b/tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro
index e356d168a4b5b83bccaf1c10e5cafa655d5d9a05..79e8a180cc52e30ce3a533125eb5ebc53a64d33b 100644
--- a/tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro
+++ b/tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro
@@ -3,7 +3,7 @@ QT += testlib
 
 DESTDIR = $$DESIGNER_BINARY_DIRECTORY
 include(../../../../../src/plugins/qmldesigner/core/core.pri)
-include(../../../../../src/shared/qmljs/qmljs.pri)
+include(../../../../../src/libs/qmljs/qmljs-lib.pri)
 HEADERS+=../../../../../src/libs/utils/changeset.h
 SOURCES+=../../../../../src/libs/utils/changeset.cpp
 INCLUDEPATH+=../../../../../src/libs
diff --git a/tests/auto/qml/qmldesigner/coretests/coretests.pro b/tests/auto/qml/qmldesigner/coretests/coretests.pro
index 803f2418869112b3c3538aa2f40a1fd1d5e53c80..c4a7de34a7d2c37aa6c361896fd28e90c1d5ab43 100644
--- a/tests/auto/qml/qmldesigner/coretests/coretests.pro
+++ b/tests/auto/qml/qmldesigner/coretests/coretests.pro
@@ -4,7 +4,7 @@ QT += testlib \
     declarative
 DESTDIR = $$DESIGNER_BINARY_DIRECTORY
 include(../../../../../src/plugins/qmldesigner/core/core.pri)
-include(../../../../../src/shared/qmljs/qmljs.pri)
+include(../../../../../src/libs/qmljs/qmljs-lib.pri)
 HEADERS+=../../../../../src/libs/utils/changeset.h
 SOURCES+=../../../../../src/libs/utils/changeset.cpp
 INCLUDEPATH+=../../../../../src/libs
diff --git a/tests/auto/qml/qmldesigner/propertyeditortests/propertyeditortests.pro b/tests/auto/qml/qmldesigner/propertyeditortests/propertyeditortests.pro
index 9c86267b81b6cbe8e54d3fae14bbf8ed16c7b9d2..0f353ce58ded19fa17bf05201da6b00417ded4b3 100644
--- a/tests/auto/qml/qmldesigner/propertyeditortests/propertyeditortests.pro
+++ b/tests/auto/qml/qmldesigner/propertyeditortests/propertyeditortests.pro
@@ -6,7 +6,7 @@ QT += testlib \
     declarative
 DESTDIR = $$DESIGNER_BINARY_DIRECTORY
 include(../../../../../src/plugins/qmldesigner/core/core.pri)
-include(../../../../../src/shared/qmljs/qmljs.pri)
+include(../../../../../src/libs/qmljs/qmljs-lib.pri)
 HEADERS+=../../../../../src/libs/utils/changeset.h
 SOURCES+=../../../../../src/libs/utils/changeset.cpp
 INCLUDEPATH+=../../../../../src/libs
diff --git a/tests/auto/qml/qmleditor/lookup/lookup.pro b/tests/auto/qml/qmleditor/lookup/lookup.pro
index d23180fc5b47f3945d083dd4850b75e6e7e040b4..c4f210ac940d0048976ddacb9ccbf851a7c8ef5a 100644
--- a/tests/auto/qml/qmleditor/lookup/lookup.pro
+++ b/tests/auto/qml/qmleditor/lookup/lookup.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 CONFIG += qt warn_on console depend_includepath
 QT += testlib
-include(../../../../../src/shared/qmljs/qmljs.pri)
+include(../../../../../src/libs/qmljs/qmljs-lib.pri)
 DEFINES += QML_BUILD_STATIC_LIB
 EDITOR_DIR=../../../../../src/plugins/qmljseditor
 
diff --git a/tests/auto/qml/qmleditor/lookup/tst_lookup.cpp b/tests/auto/qml/qmleditor/lookup/tst_lookup.cpp
index c081781b814fa616b98c795d7a4ca955e3429241..fb5e30f7ba55e89f6ec86cce5c8df1d99962d1ff 100644
--- a/tests/auto/qml/qmleditor/lookup/tst_lookup.cpp
+++ b/tests/auto/qml/qmleditor/lookup/tst_lookup.cpp
@@ -40,7 +40,7 @@ protected:
         const QLatin1String filename("<lookup test>");
         QmlDocument::Ptr doc = QmlDocument::create(filename);
         doc->setSource(input);
-        doc->parse();
+        doc->parseQml();
 
         QList<DiagnosticMessage> msgs = doc->diagnosticMessages();
         foreach (const DiagnosticMessage &msg, msgs) {
@@ -89,7 +89,7 @@ void tst_Lookup::basicSymbolTest()
     QmlDocument::Ptr doc = basicSymbolTest(input);
     QVERIFY(doc->isParsedCorrectly());
 
-    UiProgram *program = doc->program();
+    UiProgram *program = doc->qmlProgram();
     QVERIFY(program);
     QVERIFY(program->members);
     QVERIFY(program->members->member);
@@ -132,7 +132,7 @@ void tst_Lookup::basicLookupTest()
     QmlDocument::Ptr doc = basicSymbolTest(input);
     QVERIFY(doc->isParsedCorrectly());
 
-    UiProgram *program = doc->program();
+    UiProgram *program = doc->qmlProgram();
     QVERIFY(program);
 
     QStack<QmlSymbol *> emptyScope;