diff --git a/tests/auto/qml/qmldesigner/coretests/testcore.cpp b/tests/auto/qml/qmldesigner/coretests/testcore.cpp index bf8ca7fd750be157add481a6a60456adfe6b3709..8d1074065bd6d0f014027198aa22e19dba10c0f8 100644 --- a/tests/auto/qml/qmldesigner/coretests/testcore.cpp +++ b/tests/auto/qml/qmldesigner/coretests/testcore.cpp @@ -78,7 +78,7 @@ static void initializeMetaTypeSystem(const QString &resourcePath) QDir::Files, QDir::Name); - const QStringList errors = QmlJS::Interpreter::MetaTypeSystem::load(xmlFiles); + const QStringList errors = QmlJS::Interpreter::CppQmlTypesLoader::load(xmlFiles); foreach (const QString &error, errors) qWarning() << qPrintable(error); } diff --git a/tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp b/tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp index 107bfc02c40f240613e2a6d26759f6a99a152ded..67e32a0c43698065932e06bc28050862b75c3224 100644 --- a/tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp +++ b/tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp @@ -44,7 +44,7 @@ void TestProject::testFileFilter() QDeclarativeComponent component(&engine); component.setData(projectFile.toUtf8(), QUrl()); if (!component.isReady()) - qDebug() << component.errorsString(); + qDebug() << component.errorString(); QVERIFY(component.isReady()); QmlProjectItem *project = qobject_cast<QmlProjectItem*>(component.create()); @@ -74,7 +74,7 @@ void TestProject::testFileFilter() QDeclarativeComponent component(&engine); component.setData(projectFile.toUtf8(), QUrl()); if (!component.isReady()) - qDebug() << component.errorsString(); + qDebug() << component.errorString(); QVERIFY(component.isReady()); QmlProjectItem *project = qobject_cast<QmlProjectItem*>(component.create()); @@ -133,7 +133,7 @@ void TestProject::testFileFilter() QDeclarativeComponent component(&engine); component.setData(projectFile.toUtf8(), QUrl()); if (!component.isReady()) - qDebug() << component.errorsString(); + qDebug() << component.errorString(); QVERIFY(component.isReady()); QmlProjectItem *project = qobject_cast<QmlProjectItem*>(component.create()); @@ -165,7 +165,7 @@ void TestProject::testFileFilter() QDeclarativeComponent component(&engine); component.setData(projectFile.toUtf8(), QUrl()); if (!component.isReady()) - qDebug() << component.errorsString(); + qDebug() << component.errorString(); QVERIFY(component.isReady()); QmlProjectItem *project = qobject_cast<QmlProjectItem*>(component.create()); @@ -194,7 +194,7 @@ void TestProject::testFileFilter() QDeclarativeComponent component(&engine); component.setData(projectFile.toUtf8(), QUrl()); if (!component.isReady()) - qDebug() << component.errorsString(); + qDebug() << component.errorString(); QVERIFY(component.isReady()); QmlProjectItem *project = qobject_cast<QmlProjectItem*>(component.create()); @@ -228,7 +228,7 @@ void TestProject::testMatchesFile() QDeclarativeComponent component(&engine); component.setData(projectFile.toUtf8(), QUrl()); if (!component.isReady()) - qDebug() << component.errorsString(); + qDebug() << component.errorString(); QVERIFY(component.isReady()); QmlProjectItem *project = qobject_cast<QmlProjectItem*>(component.create()); @@ -259,7 +259,7 @@ void TestProject::testLibraryPaths() QDeclarativeComponent component(&engine); component.setData(projectFile.toUtf8(), QUrl()); if (!component.isReady()) - qDebug() << component.errorsString(); + qDebug() << component.errorString(); QVERIFY(component.isReady()); QmlProjectItem *project = qobject_cast<QmlProjectItem*>(component.create());