diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-10-14 17:35:00 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-10-14 17:35:00 (GMT) |
| commit | 1637d135906296b2a32f17ed20c86869dc1667e8 (patch) | |
| tree | 6912905d6d43d9838270a7af77d30d8b54c95b80 /src/declarative/util | |
| parent | 17ff53f665ad5de15ce7b073edd1b10b2b397b05 (diff) | |
| parent | f103ad276181090da8c70bd29f4474ea7657e03f (diff) | |
| download | Qt-1637d135906296b2a32f17ed20c86869dc1667e8.zip Qt-1637d135906296b2a32f17ed20c86869dc1667e8.tar.gz Qt-1637d135906296b2a32f17ed20c86869dc1667e8.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/declarative/util')
| -rw-r--r-- | src/declarative/util/qdeclarativefontloader.cpp | 1 | ||||
| -rw-r--r-- | src/declarative/util/qdeclarativelistmodelworkeragent.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativefontloader.cpp b/src/declarative/util/qdeclarativefontloader.cpp index 3e4a81a..d2f65ef 100644 --- a/src/declarative/util/qdeclarativefontloader.cpp +++ b/src/declarative/util/qdeclarativefontloader.cpp @@ -49,7 +49,6 @@ #include <QDebug> #include <QNetworkRequest> #include <QNetworkReply> -#include <QFile> #include <QFontDatabase> #include <private/qobject_p.h> diff --git a/src/declarative/util/qdeclarativelistmodelworkeragent.cpp b/src/declarative/util/qdeclarativelistmodelworkeragent.cpp index 6804d4a..852b055 100644 --- a/src/declarative/util/qdeclarativelistmodelworkeragent.cpp +++ b/src/declarative/util/qdeclarativelistmodelworkeragent.cpp @@ -208,7 +208,7 @@ bool QDeclarativeListModelWorkerAgent::event(QEvent *e) const QList<Change> &changes = s->data.changes; if (m_copy) { - bool cc = m_copy->count() != s->list->count(); + bool cc = m_orig->count() != s->list->count(); FlatListModel *orig = m_orig->m_flat; FlatListModel *copy = s->list->m_flat; |