summaryrefslogtreecommitdiffstats
path: root/tests/auto/jsondb-listmodel/test-jsondb-listmodel.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/jsondb-listmodel/test-jsondb-listmodel.cpp')
-rw-r--r--tests/auto/jsondb-listmodel/test-jsondb-listmodel.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/jsondb-listmodel/test-jsondb-listmodel.cpp b/tests/auto/jsondb-listmodel/test-jsondb-listmodel.cpp
index e2dffe6..2ac83cd 100644
--- a/tests/auto/jsondb-listmodel/test-jsondb-listmodel.cpp
+++ b/tests/auto/jsondb-listmodel/test-jsondb-listmodel.cpp
@@ -44,9 +44,9 @@
#include "test-jsondb-listmodel.h"
#include "../../shared/util.h"
-#include <QDeclarativeEngine>
-#include <QDeclarativeComponent>
-#include <QDeclarativeContext>
+#include <QQmlEngine>
+#include <QQmlComponent>
+#include <QQmlContext>
#include <QDir>
#include "json.h"
@@ -129,7 +129,7 @@ void TestJsonDbListModel::initTestCase()
connect( mClient, SIGNAL(error(int, int, const QString&)),
this, SLOT(error(int, int, const QString&)));
- QDeclarativeEngine *engine = new QDeclarativeEngine();
+ QQmlEngine *engine = new QQmlEngine();
QStringList pluginPaths = engine->importPathList();
for (int i=0; (i<pluginPaths.count() && mPluginPath.isEmpty()); i++) {
QDir dir(pluginPaths[i]+"/QtAddOn/JsonDb");
@@ -150,14 +150,14 @@ void TestJsonDbListModel::initTestCase()
JsonDbListModel *TestJsonDbListModel::createModel()
{
ModelData *newModel = new ModelData();
- newModel->engine = new QDeclarativeEngine();
+ newModel->engine = new QQmlEngine();
QString error;
if (!newModel->engine->importPlugin(mPluginPath, QString("QtAddOn.JsonDb"), &error)) {
qDebug()<<"Unable to load the plugin :"<<error;
delete newModel->engine;
return 0;
}
- newModel->component = new QDeclarativeComponent(newModel->engine);
+ newModel->component = new QQmlComponent(newModel->engine);
newModel->component->setData("import QtQuick 2.0\nimport QtAddOn.JsonDb 1.0 \n JsonDbListModel {id: contactsModel}", QUrl());
newModel->model = newModel->component->create();
if (newModel->component->isError())