diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-04-16 07:09:33 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-04-16 07:09:33 (GMT) |
| commit | 44ea85fb362ec2938beba477c33dab7baa8d1d42 (patch) | |
| tree | f0943f24d3c93677c505bf663f965f3819d030bc | |
| parent | 91edfd0bf779bdf835bd5dff8151db96c319bee9 (diff) | |
| parent | 1ae4c7b989b04f89a5069d5a5db78c0d8914972b (diff) | |
| download | Qt-44ea85fb362ec2938beba477c33dab7baa8d1d42.zip Qt-44ea85fb362ec2938beba477c33dab7baa8d1d42.tar.gz Qt-44ea85fb362ec2938beba477c33dab7baa8d1d42.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
| -rw-r--r-- | dist/changes-4.5.1 | 18 | ||||
| -rw-r--r-- | src/gui/kernel/qx11embed_x11.cpp | 7 |
2 files changed, 21 insertions, 4 deletions
diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index 0b06315..8d306d9 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -218,10 +218,28 @@ Third party components * Fixed path fill styles (Zack Rusin) * Fixed pre-edit text handling with input methods. +- QSqlTableModel + * [189093] QSqlTableModel did not handle updates when one of the fields + had a NULL value. + * Made setTable() try and use the db's casing of the passed tablename. + **************************************************************************** * Database Drivers * **************************************************************************** + * Fixed DB2 driver returning double field as empty + * Fixed memory leak in DB2 driver + * [249059] Fixed QPSQL datetime/time fields with negative timezone offsets + not being handled correctly. + * Fixed DB2 not enquoting table/field names properly. + * Fixed an issue with ODBC & FreeTDS not accepting quotes in statements. + * Fixed sqlite2 driver not returning false on failing to exec a statement. + * PrecisionPolicy now works in the oracle driver. + * Fixed ODBC driver returning a list of tables when requested. + * Fixed Interbase retrieving scale/precision information on numeric/decimal fields. + * Stopped drivers doing quoting again when escapeIdentifier called twice. + * Fixed sqlite2 driver not quoting fields correctly. + * [232769] Fixed memory overflow issue on bound out strings in ODBC Driver **************************************************************************** * Platform Specific Changes * diff --git a/src/gui/kernel/qx11embed_x11.cpp b/src/gui/kernel/qx11embed_x11.cpp index e49c4d6..6329135 100644 --- a/src/gui/kernel/qx11embed_x11.cpp +++ b/src/gui/kernel/qx11embed_x11.cpp @@ -481,7 +481,7 @@ QX11EmbedWidget::QX11EmbedWidget(QWidget *parent) | ExposureMask | StructureNotifyMask | SubstructureNotifyMask | PropertyChangeMask); - unsigned int data[] = {XEMBED_VERSION, XEMBED_MAPPED}; + long data[] = {XEMBED_VERSION, XEMBED_MAPPED}; XChangeProperty(x11Info().display(), internalWinId(), ATOM(_XEMBED_INFO), ATOM(_XEMBED_INFO), 32, PropModeReplace, (unsigned char*) data, 2); @@ -1571,7 +1571,7 @@ void QX11EmbedContainer::showEvent(QShowEvent *) { Q_D(QX11EmbedContainer); if (d->client) { - unsigned int data[] = {XEMBED_VERSION, XEMBED_MAPPED}; + long data[] = {XEMBED_VERSION, XEMBED_MAPPED}; XChangeProperty(x11Info().display(), d->client, ATOM(_XEMBED_INFO), ATOM(_XEMBED_INFO), 32, PropModeReplace, (unsigned char *) data, 2); } @@ -1587,8 +1587,7 @@ void QX11EmbedContainer::hideEvent(QHideEvent *) { Q_D(QX11EmbedContainer); if (d->client) { - unsigned int data[] = {XEMBED_VERSION, XEMBED_MAPPED}; - + long data[] = {XEMBED_VERSION, XEMBED_MAPPED}; XChangeProperty(x11Info().display(), d->client, ATOM(_XEMBED_INFO), ATOM(_XEMBED_INFO), 32, PropModeReplace, (unsigned char *) data, 2); } |