diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-06 07:24:18 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-06 07:24:18 (GMT) |
| commit | ebe228f3ecaa379bbfa1e8a48b0aba820a5c8254 (patch) | |
| tree | 131f616937c6b718702ff3ccb9370eeae7b4c9b6 /src/sql/models/qsqltablemodel.cpp | |
| parent | 9418962051579959981515bb74bf6463436aa75e (diff) | |
| parent | faa534e55b9a03dabc44565e45f2f19297edf29d (diff) | |
| download | Qt-ebe228f3ecaa379bbfa1e8a48b0aba820a5c8254.zip Qt-ebe228f3ecaa379bbfa1e8a48b0aba820a5c8254.tar.gz Qt-ebe228f3ecaa379bbfa1e8a48b0aba820a5c8254.tar.bz2 | |
Merge remote branch 'qt-official/4.6' into 4.6
Diffstat (limited to 'src/sql/models/qsqltablemodel.cpp')
| -rw-r--r-- | src/sql/models/qsqltablemodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sql/models/qsqltablemodel.cpp b/src/sql/models/qsqltablemodel.cpp index df94080..e5c6550 100644 --- a/src/sql/models/qsqltablemodel.cpp +++ b/src/sql/models/qsqltablemodel.cpp @@ -406,7 +406,7 @@ bool QSqlTableModel::select() QSqlQuery qu(query, d->db); setQuery(qu); - if (!qu.isActive()) { + if (!qu.isActive() || lastError().isValid()) { // something went wrong - revert to non-select state d->initRecordAndPrimaryIndex(); return false; |