diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-20 09:53:36 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-20 09:53:36 +1000 |
| commit | e35c073c72bb297b4760ee4041ce487c08723d14 (patch) | |
| tree | f29282794a926c574402ea38593023f6d7d3ef6c /dist | |
| parent | 3b016c33152d50bc6a41b7427036454167d72bf0 (diff) | |
| parent | e2e62bc810d21fecc9ed1d1db486b529b760d292 (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Add docs for QSqlRelationalTableModel::JoinMode
Fixed behavior on NULL foreign keys
update change file
Forward port qt modifications for sqlite3.c
Forward port the vxworks changes
Update sqlite to 3.7.7.1
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/changes-4.8.0 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/dist/changes-4.8.0 b/dist/changes-4.8.0 index 247a25a4ee..b8e3842fc7 100644 --- a/dist/changes-4.8.0 +++ b/dist/changes-4.8.0 @@ -119,7 +119,10 @@ QtScript -------- - Deprecated qScriptValueFromQMetaObject, qScriptValueToValue, qScriptValueFromValue +QtSql +----- + - Update sqlite to 3.7.7.1 **************************************************************************** * Database Drivers * **************************************************************************** |