| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/corelib/kernel/qcoreevent.cpp
src/corelib/tools/qdumper.cpp
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget_p.h
src/gui/kernel/qwidget_s60.cpp
src/gui/text/qfontdatabase.cpp
src/network/access/qnetworkreplyimpl.cpp
src/sql/drivers/ibase/qsql_ibase.cpp
src/testlib/qtestcase.cpp
src/testlib/testlib.pro
tests/auto/network-settings.h
tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
tests/auto/qobjectrace/tst_qobjectrace.cpp
tests/auto/qsqldatabase/tst_qsqldatabase.cpp
tools/configure/configureapp.cpp
translations/qt_ru.ts
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
configure.exe
src/network/access/qhttpnetworkconnection_p.h
tests/auto/qstyle/qstyle.pro
tests/auto/qstyle/tst_qstyle.cpp
tools/configure/configureapp.cpp
configure.exe will be recompiled in next commit. Took ours.
|
| | |
| | |
| | |
| | |
| | | |
Task-number: 257247
Reviewed-by: trustme
|
| | |
| | |
| | |
| | |
| | |
| | | |
The comparison was mistakenly only uppercasing one side, so mixed case
table names were reporting back as if they weren't found for both
QSqlDatabase::record() and QSqlDatabase::primaryIndex()
|
| | |
| | |
| | |
| | |
| | | |
When the precisionpolicy is high, and the field is numeric, it was getting
confused as a string field and pulling the wrong length value.
|
| | |
| | |
| | |
| | |
| | | |
Tinyint only supports 0-255, so mark it as unsigned despite sign flag,
which have the time is inverted/wrong.
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
- as was not the case for the psqlODBC driver
Reviewed-by: Bill King
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
- case for QVariant::Bool in switch statement was missing
Task-number: 215511
Reviewed-by: TrustMe
|
| |/
| |
| |
| | |
This saves memory and prevents warnings from RVCT.
|
|\ \ |
|
| |\ \
| | |/
| | |
| | |
| | |
| | | |
Conflicts:
src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
|
| | | |
|
| | |
| | |
| | |
| | | |
delete -> delete []
|
|\ \ \
| |/ / |
|
| |\ \
| | |/
| | |
| | |
| | | |
Conflicts:
tests/auto/qsqldatabase/tst_databases.h
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
- add checks for failed malloc's
- convert some of the obvious malloc'ed stuff to use new/delete
Task-number: 200217
Reviewed-by: Bill King
|
|\ \ \
| |/ /
| | |
| | |
| | | |
Conflicts:
src/gui/kernel/qapplication_x11.cpp
|
| |\ \
| | |/
| | |
| | |
| | | |
Conflicts:
src/sql/drivers/psql/qsql_psql.cpp
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
Passes all autotests.
Task-number: 251739
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Until the PostgreSQL API has this functionality.
Use a hack to find out if a transaction has failed or not.
This hack is a limited to 8.x versions of PostgreSQL.
Bill King
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/qnamespace.qdoc
src/corelib/global/qnamespace.h
src/gui/graphicsview/qgraphicsscene.cpp
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If no quotes around identifiers are provided by the programmer,
identifiers are treated identically to how the underlying engine
would behave. i.e. some engines uppercase the identifiers
others lowercase them. If the programmer wants case sensitivty
and/or use whitespaces they will need to quote their identifiers.
The previous (incorrect) behaviour always quoted the identifiers.
Originally committed to 4.5, but removed due to BC concerns, this
is a reintegration into mainline for inclusion in 4.6
Reviewed-by: Bill King
|
| | |
| | |
| | |
| | | |
DB2 is now tested and working, which completes the drivers.
|
| | |
| | |
| | |
| | | |
All autotests pass now for all databases except DB2 (untested).
|
|\ \ \
| |/ /
| | |
| | |
| | | |
Conflicts:
src/gui/graphicsview/qgraphicsscene_p.h
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| |\ \
| | |/ |
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | |
| | | |
This reverts commit bb7bddc47dd0748b45d22180d9e3c8e5209010b3
due to forward binary compatibility issues in a point release.
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/qnamespace.qdoc
doc/src/snippets/code/src_gui_qproxystyle.cpp
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication_x11.cpp
src/gui/kernel/qt_x11_p.h
src/gui/kernel/qwidget.cpp
src/gui/styles/qproxystyle.cpp
src/gui/styles/qstyle.cpp
src/scripttools/debugging/qscriptdebugger.cpp
src/scripttools/debugging/qscriptenginedebugger.cpp
src/sql/drivers/odbc/qsql_odbc.cpp
src/sql/kernel/qsqldatabase.cpp
src/sql/kernel/qsqldriver.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Using QSQLLEN instead of SQLINTEGER, similar to the one used in
qGetIntData().
Reviewed-by: Jens Bache-Wiig
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Queries now ask the database object what precision they should be,
allows for setting precision policies on sql models, where previously
this was not available. Also fixes some failing precisionpolicy implementations,
as well as working around the fact qstring can't convert from "123.00" to
an int based type.
|
|/ / |
|
|/
|
|
|
| |
used character operations whenever possible
better usage of QLatin1String
|
|
|
|
|
|
| |
Found by valgrind, value isn't set but is used, fixes this.
Reviewed-by: Justin McPherson
|
|
|
|
|
|
| |
As found by valgrind. Also add error reporting that was missing.
Reviewed-by: Justin McPherson
|
|
|
|
|
|
| |
As suggested in gitorius merge request 421, solution supplied by Harald.
Reviewed-by: Harald Fernengel
|
|
|
|
|
|
| |
Allows for cleaner multi-thread working for mysql clients.
Task-number: 253407
|
|
|
|
|
|
| |
Uses fb_interpret instead of isc_interprete if using firebird. Closes a potential security hole/buffer overrun.
Reviewed-by: Justin McPherson
|
|
|
|
|
|
|
| |
If a QSqlQuery survived the lifetime of removal of a mysql db connection (that failed), the cleanup code would cause a segfault because it was using an out of date pointer that was pointing at memory that'd been freed by the removeDatabase() call.
Revby: Justin McPherson
Task-number: 205701
|
|
|
|
| |
Task-number: 246808
|
|
|
|
| |
Reviewed-by: nrc
|
|
|
|
| |
Task-number: 250632
|
|
|
|
| |
Best as I can determine via trial and error. It should make vc6 compile again though.
|
|
|
|
| |
It seems that after approx version 2.7.0, microsoft changed the ODBC types of certain functions, to cater for 64bit architectures. This tries to be a little bit smarter about which types are used in which places.
|
|
|
|
|
|
|
| |
Alleviates the performance hit of querying the database except when necessary,
try and use XSQLVAR as much as possible, except for floating point fields.
Task-number: 252426
|
|
|
|
|
| |
Differring case of username shouldn't mean adding the username on front.
Also fixes autotest failures.
|