2 files changed, 5 insertions, 9 deletions
diff --git a/src/declarative/extra/qmlsqlconnection.cpp b/src/declarative/extra/qmlsqlconnection.cpp
index 3e2032c..7f1fec2 100644
--- a/src/declarative/extra/qmlsqlconnection.cpp
+++ b/src/declarative/extra/qmlsqlconnection.cpp
@@ -62,7 +62,6 @@ public:
     int port;
     QString name, databaseName, connectionOptions;
     QString hostName, userName, password, driver;
-    QmlContext *context;
 };
 
 /*!
@@ -177,8 +176,6 @@ public:
 QmlSqlConnection::QmlSqlConnection(QObject *parent)
 : QObject(*(new QmlSqlConnectionPrivate), parent)
 {
-    Q_D(QmlSqlConnection);
-    d->context = QmlContext::activeContext();
 }
 
 /*!
@@ -416,10 +413,11 @@ QSqlDatabase QmlSqlConnection::database() const
     }
     if (db.isOpen())
         return db;
-    if ((d->driver.isEmpty() || d->driver == QLatin1String("QSQLITE")) && d->context) {
+    if ((d->driver.isEmpty() || d->driver == QLatin1String("QSQLITE")) && 
+            qmlContext(this)) {
         // SQLITE uses files for databases, hence use relative pathing
         // if possible.
-        QUrl url = d->context->resolvedUrl(d->databaseName);
+        QUrl url = qmlContext(this)->resolvedUrl(d->databaseName);
         if (url.isRelative() || url.scheme() == QLatin1String("file"))
             db.setDatabaseName(url.toLocalFile());
         else
diff --git a/src/declarative/extra/qmlxmllistmodel.cpp b/src/declarative/extra/qmlxmllistmodel.cpp
index 13faab2..44787b5 100644
--- a/src/declarative/extra/qmlxmllistmodel.cpp
+++ b/src/declarative/extra/qmlxmllistmodel.cpp
@@ -87,7 +87,7 @@ class QmlXmlListModelPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QmlXmlListModel)
 public:
-    QmlXmlListModelPrivate() : size(-1), highestRole(Qt::UserRole), reply(0), context(0), roleObjects(this) {}
+    QmlXmlListModelPrivate() : size(-1), highestRole(Qt::UserRole), reply(0), roleObjects(this) {}
 
     QString src;
     QString query;
@@ -100,7 +100,6 @@ public:
     QNetworkReply *reply;
     mutable QByteArray xml;
     QString prefix;
-    QmlContext *context;
 
     struct RoleList : public QmlConcreteList<XmlListModelRole *>
     {
@@ -144,7 +143,6 @@ QmlXmlListModel::QmlXmlListModel(QObject *parent)
     : QListModelInterface(*(new QmlXmlListModelPrivate), parent)
 {
     Q_D(QmlXmlListModel);
-    d->context = QmlContext::activeContext();
 }
 
 QmlXmlListModel::~QmlXmlListModel()
@@ -249,7 +247,7 @@ void QmlXmlListModel::fetch()
 
     QNetworkRequest req((QUrl(d->src)));
     req.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);
-    d->reply = d->context->engine()->networkAccessManager()->get(req);
+    d->reply = qmlContext(this)->engine()->networkAccessManager()->get(req);
     QObject::connect(d->reply, SIGNAL(finished()),
                     this, SLOT(requestFinished()));
 }