diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-10 07:37:47 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-10 07:37:47 (GMT) |
| commit | 56a50deeb27032bd2125a6950a8044d77513a0fd (patch) | |
| tree | a7539e3d9467df032ab4c5811da3ad9e5b4a784e /src/sql | |
| parent | 81f3b28f2f82b15f9d255ec38abdc5f749b8809c (diff) | |
| parent | 6da8c83d8b5465cf9b767f288d3ebfa0727085c2 (diff) | |
| download | Qt-56a50deeb27032bd2125a6950a8044d77513a0fd.zip Qt-56a50deeb27032bd2125a6950a8044d77513a0fd.tar.gz Qt-56a50deeb27032bd2125a6950a8044d77513a0fd.tar.bz2 | |
Merge commit 'upstream/4.6' into 4.6
Diffstat (limited to 'src/sql')
| -rw-r--r-- | src/sql/models/qsqlquerymodel.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/sql/models/qsqlquerymodel.cpp b/src/sql/models/qsqlquerymodel.cpp index 1719239..319055e 100644 --- a/src/sql/models/qsqlquerymodel.cpp +++ b/src/sql/models/qsqlquerymodel.cpp @@ -314,6 +314,7 @@ void QSqlQueryModel::setQuery(const QSqlQuery &query) QSqlRecord newRec = query.record(); bool columnsChanged = (newRec != d->rec); bool hasQuerySize = query.driver()->hasFeature(QSqlDriver::QuerySize); + bool hasNewData = (newRec != QSqlRecord()) || !query.lastError().isValid(); if (d->colOffsets.size() != newRec.count() || columnsChanged) d->initColOffsets(newRec.count()); @@ -328,13 +329,13 @@ void QSqlQueryModel::setQuery(const QSqlQuery &query) d->error = QSqlError(); d->query = query; d->rec = newRec; - + if (mustClearModel) endRemoveRows(); - - d->atEnd = false; - if (columnsChanged) + d->atEnd = false; + + if (columnsChanged && hasNewData) reset(); if (!query.isActive() || query.isForwardOnly()) { |