From e86f2e6041b1b8351bce899186da59216725ea0b Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@nokia.com>
Date: Mon, 18 Jan 2010 13:26:30 +0100
Subject: [PATCH] Fixed tests and tools to use the qmljs dll/so.

---
 src/tools/qmldesigner/standalone/standalone.pro             | 2 +-
 tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro    | 2 +-
 tests/auto/qml/qmldesigner/coretests/coretests.pro          | 2 +-
 .../qmldesigner/propertyeditortests/propertyeditortests.pro | 2 +-
 tests/auto/qml/qmleditor/lookup/lookup.pro                  | 2 +-
 tests/auto/qml/qmleditor/lookup/tst_lookup.cpp              | 6 +++---
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/tools/qmldesigner/standalone/standalone.pro b/src/tools/qmldesigner/standalone/standalone.pro
index 9bc191991af..9c574f855f8 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 e356d168a4b..79e8a180cc5 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 803f2418869..c4a7de34a7d 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 9c86267b81b..0f353ce58de 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 d23180fc5b4..c4f210ac940 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 c081781b814..fb5e30f7ba5 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;
-- 
GitLab