Commit e86f2e60 authored by Erik Verbruggen's avatar Erik Verbruggen
Browse files

Fixed tests and tools to use the qmljs dll/so.

parent 205c9b3f
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
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
......
......@@ -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;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment