diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-20 15:50:16 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-20 15:50:16 (GMT) |
commit | 5a5e2d692981add098bd2fb6a7a15613778fb62c (patch) | |
tree | f5aaee3721706fb3d9b7b7e04ad600aed057cbe2 /src/sql/drivers/sqlite/qsql_sqlite.cpp | |
parent | 84f0ae22f4b1e7882f4c0fff2a1f5bc47ebceb37 (diff) | |
parent | f6d816ffe37ac74d29a7423683d4e046a3906b74 (diff) | |
download | Qt-5a5e2d692981add098bd2fb6a7a15613778fb62c.zip Qt-5a5e2d692981add098bd2fb6a7a15613778fb62c.tar.gz Qt-5a5e2d692981add098bd2fb6a7a15613778fb62c.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
No repaint when resizing graphics item with an effect.
Fix sqlite driver doesn't return error message RAISE by a trigger.
Diffstat (limited to 'src/sql/drivers/sqlite/qsql_sqlite.cpp')
-rw-r--r-- | src/sql/drivers/sqlite/qsql_sqlite.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/sql/drivers/sqlite/qsql_sqlite.cpp b/src/sql/drivers/sqlite/qsql_sqlite.cpp index d3be304..9b9d30b 100644 --- a/src/sql/drivers/sqlite/qsql_sqlite.cpp +++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp @@ -259,6 +259,7 @@ bool QSQLiteResultPrivate::fetchNext(QSqlCachedResult::ValueCache &values, int i q->setAt(QSql::AfterLastRow); sqlite3_reset(stmt); return false; + case SQLITE_CONSTRAINT: case SQLITE_ERROR: // SQLITE_ERROR is a generic error code and we must call sqlite3_reset() // to get the specific error message. |