diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-10 12:48:01 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-10 15:31:45 +0200 |
| commit | 143c4d3e13a430b951f4f4f8c28db14303f80605 (patch) | |
| tree | 2b89637b93fc7d81c674106008566010f986d67c /dist | |
| parent | a7ed81b557d593a8ddb43b71bf4bbf3b44ead070 (diff) | |
| parent | e5337ad1b1fb02873ce7b5ca8db45f6fd8063352 (diff) | |
Merge remote-tracking branch 'origin/master' into api_changes
Conflicts:
configure
src/widgets/styles/qwindowsxpstyle.cpp
tests/auto/gui/kernel/qwindow/qwindow.pro
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
Change-Id: I624b6d26abce9874c610c04954c1c45bc074bef3
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/changes-5.0.0 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/dist/changes-5.0.0 b/dist/changes-5.0.0 index cfb83a4093..5ffeb1996c 100644 --- a/dist/changes-5.0.0 +++ b/dist/changes-5.0.0 @@ -246,7 +246,7 @@ information about a particular change. - QSystemLocale has been removed from the public API. -- QSqlQueryModel::indexInQuery() is now virtual. See note below under QSql. +- QSqlQueryModel::indexInQuery() is now virtual. See note below under QtSql. - QSqlDriver::subscribeToNotification, unsubscribeFromNotification, subscribedToNotifications, isIdentifierEscaped, and stripDelimiters @@ -506,6 +506,11 @@ now that QSqlDriver subclasses can reimplement these directly. * Database Drivers * **************************************************************************** +sqlite +------ +* QVariant::Bool type now mapped to integers 0/1 in SQL instead of strings +'true' and 'false'. Sqlite does not have a boolean column type and it is +customary to use integer. QTBUG-23895 **************************************************************************** * Platform Specific Changes * |