| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.
Change-Id: I7e3e96183e073877b46bc8071b2ccae19e69426b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
QDatetTime must be formatted as ISO8601 specifies, date/month must be padded with 0 until width is 2
Task-number:QTBUG-33389
Change-Id: I2db10e4b0f55a2666b2a12d7d8fcd03f13b96875
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Instead of using a list and appending / popping of elements, use
a vector of constant size and access via index to avoid
bookkeeping errors.
Task-number: QTBUG-37831
Change-Id: Icb5a182626c63e693b04daaf7a2f70997d9aeae1
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
(cherry picked from qtbase/d5ff16bc8ebf0f17fae3a28f08018db26567e81c)
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g'
Manually patched files:
demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h
demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
src/3rdparty/s60/eiksoftkeyimage.h
tools/qdoc3/test/qt-project.qdocconf
tests/auto/qsharedpointer/nontracked.h
tests/auto/qsharedpointer/nontracked.cpp
Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Rewrite code to use QByteArray::reserve(), QByteArray::append()
instead of memcpy().
Task-number: QTBUG-37508
Change-Id: I16ead153f33fa5a34bc01ee27ae4cd1b8993b65e
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
(cherry picked from qtbase/0d50efeae9829336ffb7e47692cfdc649e10ee70)
|
|
|
|
|
|
| |
Change-Id: I6d6461eec24895e9aa0e77deccd39210958b7e2c
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
(cherry picked from qtbase/96a22ed926cfd706c1b5aca1881f124bc9624f2f)
|
|
|
|
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-30076
Change-Id: I408cda941884f01484d0edfa82c91fc19cb8718c
Reviewed-by: Israel Lins Albuquerque <israelins85@yahoo.com.br>
Reviewed-by: Sergey Blagodarin
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Andras Mantia <andras@kdab.com>
(cherry picked from qtbase/e3c5351d06ce8a12f035cd0627356bc64d8c334a)
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Failure to initialize the variable can cause spurious non-zero
values.
http://msdn.microsoft.com/en-us/library/windows/desktop/ms715438(v=vs.85).aspx
"..value can either be a SQLULEN value or a null-terminated character
string. If the value is a SQLULEN value, some drivers may only write the
lower 32-bit or 16-bit of a buffer and leave the higher-order
bit unchanged. Therefore, applications should use a buffer of SQLULEN
and initialize the value to 0 before calling this function. Also, the
BufferLength and StringLengthPtr arguments are not used."
Follow-up to 1509316a37fb2d365230d020d1dfc251c830fd56
Change-Id: I2e92eb845a2590bea0849c52bde8902adff1b419
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
(cherry-picked from qtbase commit af35ee291a1bbbc8627f9a17f7e104898d49b138)
|
|
|
|
|
|
|
|
|
|
| |
In reset() if SqlExecDirect returns SQL_NO_DATA the column metadata
is ignored.
Change-Id: I0501fa47c42754bba42b3531da59e66c696eac53
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
(cherry-picked from qtbase commit f9d856b3f5a4ceaeb8a5ac88aad2ad6b9e540abf)
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The QODBCResult::exec() returns false when query is an delete
with no data do delete caused by SQLExecute function returning
SQL_NO_DATA, but the false return means error on execution.
Task-number: QTBUG-10569
Change-Id: I6c7ebadcf62ab404b60c7bcccdab6a10bf16a923
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
(cherry-picked from qtbase commit 0646d1131b4bc65cdd9af29f4ce00fdd2398a3df)
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Caused by operator precedence error.
Follow-up to commit b8b79a0f37ec74fd5b4ad829e522a384ba3622ae
Task-number: QTBUG-2192
Change-Id: I17decd18c469b48a0bc938ae05c16cced8042219
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
(cherry-picked from qtbase commit 36b6d4afc970a328cced87af3d39b70d327eb3ad)
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-14904
Cherry-picked Qt5 change:
18be0749eb58316036d6eaff9dc5fecc1379f31a
Change-Id: I81edd9df68cfde15900315978dc3742ca6e22df5
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Postgres can report detailed information about an error using error codes.
See http://www.postgresql.org/docs/8.1/static/errcodes-appendix.html .
The current driver doesn't report the error, nor is it supported by the
QSqlError object.
The patch appends the error to the error message, helping applications to:
- handle different errors in a specific way
- show correct, translated error messages, independently on the language of the postgres installation
Change-Id: I5c7792606307afdefaeae37c512949c85c2c7674
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
(cherry picked from commit qtbase/8ccab9b029ed2a2444d89a9cfc6c4a1866b8e82d)
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
On X64 Linux DB2 driver build give an error on BIGINT conversion to
QVariant, casting it to qint64 solved the problem.
Task-number: QTBUG-20172
Change-Id: Id11b8a4b1f4ed3d5ed9854dfb53526d401b7d97d
(cherry picked from qtbase/c8e34ed678145f2e5709d39007e27e186d1bc1f9)
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The presence of the sentence "If this is the last QSqlDatabase object
that uses a certain database connection, the database connection is
automatically closed" is misleading, whether or not the statement is
true. It is about an internal detail of QSqlDatabase's implementation.
As such it is not appropriate for user documentation. The user should be
focused on how to use addDatabase(), cloneDatabase() and removeDatabase()
correctly.
Task-number: QTBUG-29481
Change-Id: I0c39584be260e13340834c34098368fcce4a7419
Reviewed-by: Florian Paul Schmidt <mista.tapas@gmx.net>
Reviewed-by: Sune Vuorela <sune@vuorela.dk>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
(cherry picked from qtbase/0b8065b5819efd8ba3741ea5703d5b95954b16c2)
|
|
|
|
|
|
|
|
|
|
|
| |
It's possible that different database libraries share dependencies.
We need to keep their link lists intact here so that QtSql's .prl and
.pc files will have them in the right order. Particularly important
when building the drivers into QtSql and using static linking.
Change-Id: Id371b127099f2790fe7cccd0c7059607600f447d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qt5/qtbase commit 9ef48277f959ff759bd9fba36c907ef5ed67f5b1)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch fixes a critical bug in the qsqlpsql driver where
notifications aren't delivered when received. Any blocking libpq
function(specifically PQexec) will read all the incoming data
from the socket, including any pending notifications. This would
cause the socket notifier to never be fired for incoming
notifications that are already queued inside libpq. The qsqldriver
test case was skipping the postgres notification test because of
this bug, now its enabled and passing. In order to fix this
bug I made a wrapper function for PQexec in QPSQLDriverPrivate
that calls _q_handleNotification via QMetaObject::callMethod
QueuedConnection in order to deliver pending notifications
when control returns to the event loop. I also added a flag
to ensure only one call is made each time the event loop is
entered.
This backport omits the changes to the NotificationSource version
of the "notification" signal that were included in the original
commit, since NotificationSource itself has not yet been introduced
into Qt4.
(Backport of qtbase aea684506945a12312fc05fb3bb4f549da93f7f5)
Change-Id: I19f5297094ae7ae46bfb0717e4fca744d69f7b92
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
|
|
|
|
|
|
| |
Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Last column index is columnCount() - 1
This change is not applicable to Qt 5.
Task-number: QTBUG-28961
Change-Id: Ib962ab5f737bf9c216423ee9d0632757d33f3bd2
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The error and message handlers used by the freetds library were getting
reset to back to the default every time a database was opened. The
Qt TDS SQL driver was calling dbinit() from QTDSDriver::open(). This
had two problems:
1. dbinit() would reset the error handler previously set by a call to
dberrhandle(). A db error would then cause the application to
abort.
2. freetds expects dbinit() and dbexit() to be called symmetrically.
Opening multiple database connections would result in freetds not
cleaning up on application close.
Solved by moving the dbinit() call into the QTDSDriver constructor.
Backported from Qt5/qtbase change 7456562e7f647e7cb2c854c4272c5599b26dbd37
Change-Id: I43087a44d74de38918c7285a228e2f3d25d070fd
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
MYSQL_TYPE_TINY should be used for binding bool input value.
MYSQL_TYPE_LONG might be too big for bool, resulting in bools being
saved in the database as int 127. The problem was not specific to
the vendor's BOOL column type.
http://dev.mysql.com/doc/refman/5.0/en/numeric-type-overview.html
http://dev.mysql.com/doc/refman/5.0/en/c-api-prepared-statement-type-codes.html
Added generic autotest to make sure that binding bool works. All
drivers should pass this test.
Task-number: QTBUG-27763
Change-Id: I4e69f8e3b32fffb702ec9fa8a80ff5c50dea954b
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
(cherry picked from qt5/qtbase commit 593b8f7f0b35ddc424d8ccbd5df11fcf2442858e))
|
|
|
|
|
|
|
|
|
|
| |
Follow-up to commit c9f77564df14f91276e9ca693a9b3f339dab9334
Task-number: QTBUG-27482
Change-Id: I17c12ee14d4609bccbe67bba2581f13d72c069ae
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
(cherry picked from qt5/qtbase commit 7a34e88edcc8b05744cede732f79f99acaad75ef)
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
|
|
|
|
|
|
|
| |
Change-Id: I69e4178bbe967a70b1141122639883b5cbacd924
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
(cherry picked from qt5/qtbase commit f8cfb4bebd331ca950511570d141c5ec9172c7e6)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
SQL Server 10 introduced stricter rules for TIMESTAMP validation,
making it necessary to specify the decimal digits.
Other databases might do the same as well, so this patch introduces
a check for the TIMESTAMP column size and adjusts the decimal digits
parameter as needed.
Task-number: QTBUG-2192
Change-Id: If6d798c6c928ebda75bc474e49a07fbbfbe5816c
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
(cherry picked from qtbase/b8b79a0f37ec74fd5b4ad829e522a384ba3622ae)
|
|
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Cherry-picked from qt5/qtbase 4692432b61b09f010a3a7e57e80b9599686fe438
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
Change-Id: I1944946b5f17bbf69005d2da30cedff4970f9827
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Replace Nokia contact email address with Qt Project website.
- Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
|
| |
Task-number: QTBUG-23260
Change-Id: I7d9ff3a23e1f20df5883d7c932a51c582945685c
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
These methods failed to respect the setting of the generated flag
on the fields of source record. INSERT and UPDATE statements should
only include fields where generated is TRUE.
Test included.
Follow-up to 0f15ab4e750690bdb2b649332d5c3276bf24c440.
Change-Id: I2f10dbcd7e5e5123489b38a123effe43a673a427
Task-number: QTBUG-23592
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Jason Dolan <jason.t.dolan@gmail.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
|
|
|
|
|
|
|
|
|
| |
This fix complements the commit 8c28db8cda. A similiar function call was
forgotten in the previous fix.
Task-number: QTBUG-25256
Change-Id: I38880e755a78951985484b718c89ac43a6dc2b4c
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
|
|
|
|
|
|
|
| |
Change-Id: If046e674abad9c2dcff934a2fdd80d4133e1f4ad
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
cherry-picked from qt5/qtbase: 508a90302b5bd2a1b228c62d1a1b24a3e66d24a9
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Windows API call to SQLGetStmtAttr() attempts to place an 8 byte value
into the isScrollable variable which of type SQLINTEGER which is a long
and is 32 bit on Windows even when the driver is compiled for 64 bit.
Changing the isScrollable to and 8 byte SQLULEN type.
Task-number: QTBUG-25256
Change-Id: I1aae0b306e8d1ff5fc3b293b3e9ddd40546b85ad
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Honglei Zhang <honglei.zhang@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If an ongoing query is not finalized before close function is called,
sqlite driver can't close the connection to sqlite. In this case, the
failure is only reported to the client via getLastError(). Even if the
client want to handle this case, there is no easy way to revoke the
close function. This commit finalizes all queries before
close is called.
Task-number: QTBUG-16967
Change-Id: I069f6073bd46f53780e13d269e44aa86366e0574
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When an aggregate function is used for a column in a SQL resultset then
it should ensure that the right data type is reported for that column.
This also concerns expressions when the returned column does not map
directly to a table column.
Test included for this.
Task-number: QTBUG-22038
Change-Id: I681297accc979081d14b44d190ab9d5f83aac215
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Reviewed-by: Honglei Zhang <honglei.zhang@nokia.com>
(cherry picked from commit 678ab52ccba0b6a6903e9aee404dbe84fb74c91d)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QSqlDatabase::database() is documented to be thread-safe and when the
driver is queried for the numericalPrecisionPolicy set then it can
comprimise the thread-safety.
Since the driver itself (if one is set) will be queried for the
numericalPrecisionPolicy when numericalPrecisionPolicy() is called on
the QSqlDatabase then we can have it fallback to the default instead
rather than taking the driver's own setting.
Task-number: QTBUG-13423
Change-Id: Ie6a8ed76236a3bb3b8bfdb61ef156699b05a93ab
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-18101
Task-number: QTBUG-8673
Task-number: QTBUG-14194
Task-number: QTBUG-9109
Task-number: QTBUG-9466
Task-number: QTBUG-8323
Task-number: QTBUG-7924
Task-number: QTBUG-20355
Task-number: QTBUG-19367
Task-number: QTBUG-21295
Task-number: QTBUG-14554
Task-number: QTBUG-8331
Task-number: QTBUG-8329
Task-number: QTBUG-8786
Task-number: QTBUG-8787
Change-Id: I4b6403df4a0078fa385abbfab5b6c3a94f175295
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The 'real' datatype should be seen as a QVariant::Double type and not as
a QVariant::String type otherwise it does not get presented correctly
when using a non Qt application to access it.
Test is included for QSqlQuery.
Task-number: QTBUG-16373
Change-Id: Ie323ce49eb95e4d6bb4c3814ba9a957a63f4b259
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
| |
Introduced a problem for the SDK (QTBUG-23036).
This reverts commit 9a5fb6bd5f0fb3b37897bf722e4cc1673309623c.
|
|
|
|
|
|
|
|
|
| |
QSqlRelationalTableModel doesn't follow relations on the first column
of a table. The DisplayRole and the EditRole for indexes on column 0
are always the same. The bug is found in QSqlRelationalTableModel::data.
Task-number: QTBUG-20038
Reviewed-by: Charles Yin
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If an ongoing query is not finalized before close function is
called, sqlite driver still tries to close the connection to
sqlite. In this case, sqlite reports an error to sqlite driver
which is not reported to the client. The failure in close causes
connection to sqlite unclosed and memory is not freed. This
fix tries to finalize all queries before close function is called.
The close function should succeed.
Task-number: QTBUG-16967
Reviewed-by: Charles Yin
|
|
|
|
|
|
|
|
|
|
| |
SQLite driver support only one statement at a time. This fix makes the
exec and prepare call failed if more than one statements are given.
This is bug fix for QTBUG-21884. Also the behaviour is documented in
the API specification.
Task-number: QTBUG-21884
Reviewed-by: Charles Yin
|
|
|
|
|
|
|
| |
Reported by Freek de Kruijf in KDE translation project
Merge-request: 1405
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
| |
Task-number: QT-4860
Reviewed-by: Honglei Zhang
|
|
|
|
|
|
|
|
|
|
| |
Symbian SQL driver provides service of secure databases. SQL databases
are stored in Symbian SQL server's private data cage. The API ensures
only authorised clients can access the database. The Symbian SQL driver
enables Qt application to use Symbian secure databases.
Task-number: QT-4860
Reviewed-by: Trust Me
|
|
|
|
|
| |
Task-number: QT-4860
Reviewd-by: Honglei Zhang
|
|
|
|
|
|
|
| |
The Symbian SQL driver enables the usage of native Symbian SQL server from Qt code. Symbian SQL driver also supports the usage of Symbian platform security capabilities.
Task-number: QT-4860
Reviewed-by: Honglei Zhang
|
|\ |
|
| | |
|
| | |
|