| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
| |
Task-number: QTBUG-7988
Reviewed-by: Justin McPherson
|
|
|
|
|
| |
Task-number: QTBUG-8488
Reviewed-by: Justin McPherson
|
|
|
|
|
|
|
|
| |
Better unicode handling detection, plus turn off unicode if FreeTDS,
plus handling of returning strings under non-unicode scenarios.
Task-number: QTBUG-8846
Reviewed-by: Justin McPherson
|
|
|
|
|
|
|
|
|
| |
The original CLOB was being truncated at 4000 bytes, even though the
CLOB can hold up to 4gig, this ensures that its possible to get the
whole thing. There is already a test in qsqlquery for this.
Task-number: QTBUG-3875
Reviewed-by: Bill King
|
|
|
|
| |
Task-number: QTBUG-5765
|
|
|
|
| |
Task-number: QTBUG-8752
|
|
|
|
|
| |
Task-number: QTBUG-7218
Reviewed-by: Justin McPherson
|
|
|
|
|
|
| |
Stupid inconsistent constness/overall api
Task-number: QTBUG-6928
|
|
|
|
|
|
|
|
| |
Fixed ODBC to use SQLTCHAR type and not assume that wchar's are 2
bytes wide.
Task-number: QTBUG-6928
Reviewed-by: Justin McPherson
|
|
|
|
| |
This reverts commit 4935ec52fc07d4aaa7ae594cfe9986e25ca62dcb.
|
|
|
|
|
|
| |
On some platforms, especially iODBC, wchar_t is a 32bit value, not 16
Task-number: QTBUG-6928
|
|
|
|
|
|
|
| |
This modification is needed to allow performance optimisations
necessary for QML.
Reviewed-by: Warwick Allison
|
|
|
|
|
|
|
|
|
|
|
|
| |
QString::fromUtf16() is slow - it does a BOM check and optionally byte
swapping, which is utterly pointless when converting internal data
structures which are raw utf16 in host byte order anyway. so replace
it with QString::fromRawData() (for short-lived strings) or
QString(const QChar *, int) (otherwise) if possible.
Reviewed-by: axis
Reviewed-by: mariusSO
Reviewed-by: Bill King
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (71 commits)
QNAM HTTP Code: Cache socket state inside ensureConnection()
tst_qhttpnetworkconnection: Test also HEAD in some tests
tst_qhttpnetworkconnection: Relax condition in getMultipleWithPriorities
QNAM HTTP Code: When starting new request, prefer connected sockets.
typo fix
Added the 'framecapture' WebKit example to the default build.
Fix code example
fix typo in qreadwritelock's documentation
QNAM HTTP: Don't call d_func() so often
QNAM HTTP: Fix readBuffer maximum size.
QNAM HTTP: Optimize eatWhitespace()
QNAM HTTP: Check if socket already tries to connect.
network internals: fix build on S60
[syncqt] Make -separate-module work with WebKit's directory structure
doc: Corrected explanation of when append() does nothing.
doc: Added clarification about allocating space for the 0 terminator.
Add a way to access the normalised URL in QUrl.
[syncqt] Make it possible to synchronize headers for a separate module
[syncqt] Make it possible to override the base directory
network internals: start HTTP GET requests right away when called
...
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QIODevice: Fix readAll()
Temporary hackiesh solution to prevent BOM in the xml data.
Fixed qxmlstream autotest when using shadow builds.
Attempt at readding the capital P headers for Phonon
Remove special Phonon processing from syncqt.
Use the lowercase/shortname.h headers for Phonon includes
Fixes a crash when setting focus on a widget with a focus proxy.
Update copyright year to 2010
doc: Clarified activeSubControls and subControls.
Remove warning "statement with no effect"
doc: Clarified that .lnk files are System files on Windows.
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
Forgot to port the fix over to sqlite2 which seems to also be affected
by the setForwardOnly caching bug as well.
Task-number: QTBUG-6421
Reviewed-by: Justin McPherson
|
|/
|
|
|
|
|
|
|
| |
Most drivers return SQL_SUCCESS when executing a delete statement for
example, but FreeTDS returns SQL_NO_DATA, which is technically correct,
but doesn't follow the practice of other drivers.
Task-number: QTBUG-4896
Reviewed-by: Justin McPherson
|
|
|
|
|
|
|
| |
CLOB/NCLOB/LONG are actually strings, so treat them as such.
Task-number: QTBUG-4461
Reviewed-by: Justin McPherson
|
|
|
|
|
|
|
|
|
|
| |
SqlServer can throw custom error messages (via RaiseError) that can be
up to 8000 chars long. Fixed this with a pre-query as to the length of
the error string, then allocating enough space to retrieve the whole
error string at once.
Task-number: QTBUG-6618
Reviewed-by: Derick Hawcroft
|
|
|
|
|
|
|
| |
fixes setForwardOnly() for both OCI and SQLite
Task-number: QTBUG-6421
Reviewed-by: Justin McPherson
|
|
|
|
|
|
| |
During the exe(), sqlite does it's first stepping, and stores that into
the cache. It assumes that that value is still in the cache when fetchNext()
is called, and uses the "cached" value to return.
|
|
|
|
|
|
|
|
|
|
| |
readPiecewise() is assuming an empty valueCache when reading a new row.
setForwardOnly(true) means that only one row is used/re-used. The value
cache wasn't being cleared out when moving to a new row, so the above
assumption was invalid.
Task-number: QTBUG-6421
Reviewed-by: Justin McPherson
|
|
|
|
|
| |
Task-number: QTBUG-5298
Reviewed-by: Justin McPherson
|
|
|
|
| |
Task-number: QTBUG-6387
|
|
|
|
|
|
|
|
|
|
| |
database schema
PSQL doesn't like having schema scoping in "AS" aliasing of fields,
so use everything after the last "." separator for generating the alias.
Task-number: QTBUG-5373
Reviewed-by: Justin McPherson
|
|
|
|
|
|
|
| |
Add additional error handling
Task-number:QTBUG-5758
Reviewed-by: trustme
|
|
|
|
|
|
|
|
| |
The view of a table gets reset if for example a query fails.
However this also resets and removes the Header views of the
table. A better solution visually is to keep them displayed.
Task-number: QTBUG-3162
|
|\
| |
| |
| |
| |
| | |
Conflicts:
tests/auto/qsqlquery/tst_qsqlquery.cpp
tests/auto/qtextlayout/tst_qtextlayout.cpp
|
| |
| |
| |
| |
| |
| |
| |
| | |
PostgreSQL can store/retieve the millisecond part of type "TIME" , so
allow it in the API level.
Task-number: QTBUG-5251
Reviewed-by: Bill King
|
| |
| |
| |
| |
| |
| |
| | |
For example a bogus use of setFilter() might cause a query to fail.
Check for this.
Reviewed-by: Bill King
|
| |
| |
| |
| |
| |
| |
| | |
syntax errors, bad column names, etc.
Merge-request: 1987
Reviewed-by: Bill King <bill.king@nokia.com>
|
| |
| |
| |
| | |
Reviewed-by: Bill King <bill.king@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
replaces strtod call with locale aware QString::toDouble()
Task-number: QTBUG-5179
Reviewed-by: Justin McPherson
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | | |
reserve() affects capacity(), not length().
Task-number: QTBUG-551
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The crash (Q_ASSERT_X failure) happened when a proxy model was being attached
to the QSqlQueryModel, and no query was set yet. The headerDataChanged()
signal was being received by the proxy model who wouldn't check its
"proxyfied" data bounds.
The patch introduces a behaviour change. However, this change makes the usage
of QSqlQueryModel::setHeaderData() to be more in accordance with the current
documentation, and to behave in the same way as for QStandardItemModel,
QTreeModel, and QTableModel.
Task-number: QTBUG-4963
Reviewed-by: Olivier
|
| |
| |
| |
| |
| |
| | |
For non-unicode databases, use ascii.
Task-number: QTBUG-3736
|
| |
| |
| |
| |
| |
| | |
If the driver cannot be loaded, isValid() returns false.
Reviewed-by: Bill King
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Previously the renaming scheme created a new table_field alias name.
If multiple references referred to the same table/field lookup, then
multiples of the same alias would be generated in the query, leading
the query to fail.
Reviewed-by: Justin McPherson
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/webkit/WebCore/generated/CSSGrammar.cpp
src/3rdparty/webkit/WebCore/generated/CSSGrammar.h
(merged webkit files with -s ours)
|
| |
| |
| |
| | |
Task-number: QT-754
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
This fixes an issue where a forwardonly result set would force
forwardonly on the next query, despite what the user had explicitly set.
Reviewed-by: Justin McPherson
|
| |
| |
| |
| |
| |
| | |
adds MYSQL_OPT_RECONNECT to the mysql driver options.
Task-number: QTBUG-4510
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
tests/auto/qimagereader/tst_qimagereader.cpp
tests/auto/qpainter/tst_qpainter.cpp
tests/auto/qtwidgets/tst_qtwidgets.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Previously you had to set forward only on non-scrollable datasets
explicitly. This queries ODBC, to determine if it's a scrollable
dataset, and sets forwardOnly to false if it isn't.
Task-number: QT-353
Reviewed-by: Justin McPherson
|
|\ \
| |/ |
|