summaryrefslogtreecommitdiffstats
path: root/src/declarative/extra
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-07-23 05:47:43 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-07-23 05:47:43 (GMT)
commit5054fafde6b32003c8c00877f2579c611d1524f3 (patch)
tree9f79976f970095706e82d7d65b068c1e7b728d97 /src/declarative/extra
parentdd652f37353a01e0172e20f1e7ef24b001a281db (diff)
parentdc68651b60b552e010735903e45328f8ebf18f69 (diff)
downloadQt-5054fafde6b32003c8c00877f2579c611d1524f3.zip
Qt-5054fafde6b32003c8c00877f2579c611d1524f3.tar.gz
Qt-5054fafde6b32003c8c00877f2579c611d1524f3.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/extra')
-rw-r--r--src/declarative/extra/qmlxmllistmodel.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/extra/qmlxmllistmodel.cpp b/src/declarative/extra/qmlxmllistmodel.cpp
index b1ad127..077e9a9 100644
--- a/src/declarative/extra/qmlxmllistmodel.cpp
+++ b/src/declarative/extra/qmlxmllistmodel.cpp
@@ -616,6 +616,7 @@ void QmlXmlListModel::requestFinished()
{
Q_D(QmlXmlListModel);
if (d->reply->error() != QNetworkReply::NoError) {
+ disconnect(d->reply, 0, this, 0);
d->reply->deleteLater();
d->reply = 0;
d->status = Error;
@@ -623,6 +624,7 @@ void QmlXmlListModel::requestFinished()
d->status = Idle;
QByteArray data = d->reply->readAll();
d->queryId = d->qmlXmlQuery.doQuery(d->query, d->namespaces, data, &d->roleObjects);
+ disconnect(d->reply, 0, this, 0);
d->reply->deleteLater();
d->reply = 0;
}