summaryrefslogtreecommitdiffstats
path: root/src/sql/drivers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-262-7/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (61 commits) Autotest: don't use Q_FUNC_INFO for testing which method got called fix generated makefile dependencies Cocoa: Demo browser can get stuck after closing modal dialog Restore default if to system default on session close. tst_qmake doesn't need QtGui Use the full path to qmake in the qmake unit test qdoc: Fixed erroneous links to QML basic types. Fixed item view background color in Gtk style scope fixes and clutter reduction for sql driver projects I don't know why some linkers can't call this function, so comment it out. QNetworkSession::close() method now send closed() signal while faking disconnection. Add the missing license headers to the QString benchmark data Fix building of qsimd.cpp on Windows CE Use QElapsedTimer for the benchlib tests. Properly implement the CPU feature disabling in qsimd.cpp. Report the detected CPU features in the corelib boilerplate Detect CPU features on ARM by reading the ELF auxvec. Split the CPU-detection code into multiple functions for readability Fixed delivering gestures to a toplevel widget. Unroll the SSSE3 code even more to avoid the need to keep an extra variable for inverting the result ...
| * scope fixes and clutter reduction for sql driver projectsMark Brand2010-08-252-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing wildcard to scope where meant to include all win32-g++ targets. There is no reason to ignore QT_LFLAGS_TDS and QT_LFLAGS_PSQL in static builds. Via LIBS these may end up in QMAKE_PRL_LIBS in QtSql.prl. Also, the isEmpty() tests on these is redundant and only wastes time. Processing of QT_CFLAGS_PSQL should not depend on QT_LFLAGS_PSQL. It no longer seems appropriate to clean up "-lz" here in case of zlib bundled in QtCore. It's reasonable to expect QT_LFLAGS_PSQL to be ready after configure. Merge-request: 2459 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-08-261-1/+1
|\ \ | |/ |/| | | | | | | | | Conflicts: bin/syncqt src/opengl/qgl.cpp tools/configure/configureapp.cpp
| * Fix the broken unicode detection of ODBC driver.Charles Yin2010-08-241-1/+1
| | | | | | | | | | | | | | the unicode flag is entirely overrided by mistake. Task-number:QTBUG-13109 Reviewed-by:Michael Goddard
* | Improve TDS configuration through QT_LFLAGS_TDS, SYBASE, SYBASE_LIBSMark Brand2010-08-041-1/+3
| | | | | | | | | | | | | | | | | | | | Consistent with QT_LFLAGS_* for other database drivers. Support added to configure shell script and configure.exe. Respect SYBASE and SYBASE_LIBS. Use QT_LFLAGS_TDS in project files. Merge-request: 2416 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | fixes for using freetdsMark Brand2010-07-291-0/+3
| | | | | | | | | | | | | | | | | | DBNTWIN32 only if not Q_USE_SYBASE. Workaround for RETCODE typedef conflict between ODBC and FreeTDS. Include winsock2.h supplies SOCKET for FreeTDS. Merge-request: 684 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Fixed an incorrect profile inclusion.axis2010-07-221-1/+1
| | | | | | | | RevBy: Trust me
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-211-1/+33
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Use aligned load for the blending of RGB32 over RGB32 tst_moc: workaround gcc bug. Some more change to the changelog Fix compilation with QT_NO_GRAPHICSVIEW Updates changes-4.7.0 Fixes the Oracle nchar bug when NLS_CHARSET is different with NLS_NCHAR_CHARSET. Add a missing file in the config.test for SSE 4.2 Remove the masking when computing qAlpha() Add support for more vector instructions on x86 Workaround gcc bug, disable test with old version of gcc Do not crash due to a infinite recursion when using voiceover on MacOS doc: Fix qdoc errors for text related files QGraphicsItem: Animation leaves drawing artifacts when clipping is used. moc: Slot with complex template default value does not compile
| * | Fixes the Oracle nchar bug when NLS_CHARSET is different with NLS_NCHAR_CHARSET.Charles Yin2010-07-211-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | If Oracle national char types use different charset(NLS_NCHAR_CHARSET) with the database charset (NLS_CHARSET), the oci client need to set OCI_ATTR_CHARSET_FORM to SQLCS_NCHAR instead of SQLCS_IMPLICIT. Task-number: QTBUG-10919 Reviewed-by: Michael Goddard
* | | Merge branch 'raptorConfigurePatches' into 4.7-s60axis2010-07-211-0/+2
|\ \ \ | |/ / |/| | | | | | | | | | | Conflicts: configure src/sql/drivers/drivers.pri
| * | Fixed automatic sqlite extraction on Symbian makefile build system.axis2010-07-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Since we cannot extract to the epocroot (it is considered R/O), we extract the header and the dso to the temporary build directories and include them from there. RevBy: Trust me
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-161-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixes the Oracle invalid date bug when date is greater or equal to 2800
| * | | Fixes the Oracle invalid date bug when date is greater or equal to 2800Charles Yin2010-07-161-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | By converting the char into unsigned char to avoid the overflow when getting the century from a char for years greater or equal to 2800. Task-number: QTBUG-8210 Reviewed-by: Michael Goddard
* | | fix macx not having UNICODE in DEFINES any moreOswald Buddenhagen2010-07-131-7/+7
| | | | | | | | | | | | and make the cascade a bit nicer on the way ...
* | | Corrected pathsMark Brand2010-07-081-2/+2
| | | | | | | | | | | | | | | Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | fix build with sqlite2Oswald Buddenhagen2010-07-081-2/+2
| | |
* | | Simplify *= to += after contains() testMark Brand2010-07-078-14/+14
| | | | | | | | | | | | | | | Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | Consolidate sql driver configuration redundancyMark Brand2010-07-0710-119/+104
|/ / | | | | | | | | | | | | | | | | | | | | Previously sql driver recipes each appeared in both the plugin pro file and src/sql/drivers/drivers.pri for building into QtSql. Split driver recipes into shared pri files. Also split bundled 3rd party sqlite code recipe into a shared pri. Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | use "win32-g++*" scope to match all MinGW makespecsMark Brand2010-06-101-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The scope "win32-g++" comes from the name of the makespec. However, it is frequently used to check for MinGW. This works fine as long as win32-g++ is the only makespec for MinGW. Now we need the wildcard to cover "win32-g++-cross" as well. Also reordered test of win32 before win32-g++*. Also took opportunity to use else. Merge-request: 2407 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Fix compilation on WinXP MinGW32;lit-uriy2010-06-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this change, I get an error when building plug QODBC: drivers\odbc\qsql_odbc.cpp: In function 'QString qODBCWarn(const QODBCPrivate*, int*)': drivers\odbc\qsql_odbc.cpp:264: error: 'class QStringBuilder<QStringBuilder<QStringBuilder<QStringBuilder<QString, QLatin1Char>, QString>, QLatin1Char>, QString>' has no member named 'simplified' drivers\odbc\qsql_odbc.cpp: In function 'QString qODBCWarn(const QODBCDriverPrivate*, int*)': drivers\odbc\qsql_odbc.cpp:270: error: 'class QStringBuilder<QStringBuilder<QString, QLatin1Char>, QString>' has no member named 'simplified' drivers\odbc\qsql_odbc.cpp: In function 'QString qGetStringData(void*, int, int, bool)': drivers\odbc\qsql_odbc.cpp:403: warning: comparison between signed and unsigned integer expressions drivers\odbc\qsql_odbc.cpp:444: warning: comparison between signed and unsigned integer expressions Env: Windows XP SP2 MinGW (GCC 4.4.0 from trolls ftp) Merge-request: 2402 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-211-0/+1
|\ \ | |/ | | | | | | | | | | Conflicts: src/openvg/qpaintengine_vg.cpp src/script/bridge/qscriptqobject_p.h tests/auto/bic/tst_bic.cpp
| * Fix sqlite driver doesn't return error message RAISE by a trigger.Bill King2010-04-201-0/+1
| | | | | | | | | | Task-number: QTBUG-7988 Reviewed-by: Justin McPherson
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-291-38/+119
|\ \ | |/ | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro
| * Fix ODBC compilation for ODBC versions < 3.5Bill King2010-03-251-0/+2
| | | | | | | | | | Task-number: QTBUG-8488 Reviewed-by: Justin McPherson
| * Unicode fixes for ODBC SQL Driver.Bill King2010-03-251-38/+117
| | | | | | | | | | | | | | | | 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
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-151-2/+2
|\ \ | |/ | | | | | | Conflicts: src/gui/styles/qs60style_s60.cpp
| * Ensure that the entire CLOB can be returned from an Oracle databaseAndy Shaw2010-03-121-2/+2
| | | | | | | | | | | | | | | | | | 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
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-064-107/+181
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/multimedia/audioinput/audioinput.cpp src/corelib/io/qfsfileengine.cpp src/gui/egl/qegl_wince.cpp src/gui/egl/qeglproperties.cpp src/gui/egl/qeglproperties_p.h src/gui/embedded/directfb.pri src/gui/kernel/qapplication_win.cpp src/gui/painting/qdrawutil.cpp src/opengl/qgl_p.h src/sql/drivers/odbc/qsql_odbc.cpp src/sql/drivers/odbc/qsql_odbc.h tests/auto/auto.pro tests/auto/qgl/tst_qgl.cpp translations/assistant_adp_ru.ts
| * Fixes: Mysql truncation of integer values + some autotest cleanupBill King2010-03-051-0/+17
| | | | | | | | Task-number: QTBUG-5765
| * Fix compile.Bill King2010-03-021-30/+30
| | | | | | | | | | | | Stupid inconsistent constness/overall api Task-number: QTBUG-6928
| * Fixes: ODBC Driver expects 16bit when system is 32bitBill King2010-03-023-109/+169
| | | | | | | | | | | | | | | | Fixed ODBC to use SQLTCHAR type and not assume that wchar's are 2 bytes wide. Task-number: QTBUG-6928 Reviewed-by: Justin McPherson
* | improve sql support for mingw64Thierry Bastian2010-02-232-1/+7
| |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-184-16/+15
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (22 commits) optimize qstring::simplified() Revert optimizations to QString::append unbreak QList::append() and co. again Implement bookmark manager widget. optimization: use QList::reserve() and QVector::reserve() amend "purge msvc.net and msvc2002 makespecs" Added QPlainTextEditor::anchorAt(const QPoint &pos) Fix memmory leak. Fix spacing. Prevent renaming the bookmarks menu root item, it's just a placeholder. Fix broken set last shown pagen when the last page was about:blank. Move launch with external app in base class. Make sure the bookmarks menu updates on add/ remove as well. Fix broken Drag&Drop, reset and clear the model if we set new bookmarks. avoid double reallocations in appending operations avoid double reallocation in string-growing replace() case optimize qHash() some more optimize QList::mid() optimization: use QList::reserve() in QSet::toList() add QList::reserve() ...
| * | optimization: get rid of QString::fromUtf16() usage, part 2Oswald Buddenhagen2010-02-164-16/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QString::fromUtf16() is slow - it does a BOM check and optionally byte swapping, which is utterly irrelevant when converting internal data structures which are raw utf16 in host byte order. so replace it with QString::fromUnicode() where possible (which seems to be everywhere). the reasoning is the same as in commit e0fda52f, so not getting further reviews. Reviewed-by: denis Reviewed-by: joao
* | | remove -lz from QT_LFLAGS_PSQL so as to respect qt-zlibMark Brand2010-02-171-8/+5
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QT_LFLAGS_PSQL can introduce -lz. To respect qt-zlib, this must be be removed so that zlib will come from -lQtCore4. Otherwise, linking can fail due to there being two different libraries providing zlib. This affects building shared Qt. This patch fixes the problem for win32-g++ and also unix. Assumed that QT_LFLAGS_PSQL is set in configure step if -lpq is not enough. Not sure why parallel logic is in src/sql/drivers/drivers.pri but I fixed that too. Merge-request: 405 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-121-28/+19
|\ \ | |/
| * Revert "(ODBC) Use wchar_t instead of assuming 2 bytes."Bill King2010-02-111-27/+10
| | | | | | | | This reverts commit 4935ec52fc07d4aaa7ae594cfe9986e25ca62dcb.
| * (ODBC) Use wchar_t instead of assuming 2 bytes.Bill King2010-02-101-10/+27
| | | | | | | | | | | | On some platforms, especially iODBC, wchar_t is a 32bit value, not 16 Task-number: QTBUG-6928
| * (sqlite) Allow shared cache modeBill King2010-02-091-28/+19
| | | | | | | | | | | | | | This modification is needed to allow performance optimisations necessary for QML. Reviewed-by: Warwick Allison
* | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-041-2/+2
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: examples/assistant/simpletextviewer/findfiledialog.cpp qmake/generators/symbian/symmake.cpp tools/assistant/lib/qhelpgenerator.cpp tools/assistant/lib/qhelpsearchquerywidget.cpp translations/translations.pri
| * optimization: get rid of QString::fromUtf16() usageOswald Buddenhagen2010-02-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Pulse Build System2010-01-222-30/+0
|\ \ | |/ |/| | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2: build fix for mingw Build fix for MSVC2005 and older SDK QStyleSheetStyle: Fixed some text croped when having padding with native border. Remove obsolete code for unsupported platforms Character spacing when drawing a QPicture to a high DPI device.
| * Merge remote branch 'origin/master'Olivier Goffart2010-01-082-9/+25
| |\
| * | Remove obsolete code for unsupported platformsBill King2009-12-162-30/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | This code was apparently put in for OSX10.3. ODBC2 is over 10 years old now, and even microsoft doesn't support any fashion to link to the ansi versions of the functions. Remove the #define so that we don't have to support it any more. Reviewed-by: Justin McPherson
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-1118-18/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-0718-18/+18
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | Update copyright year to 2010Jason McDonald2010-01-0618-18/+18
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | (Sqlite2) Fix for QTBUG-6421Bill King2010-01-111-4/+12
|/ / / | | | | | | | | | | | | | | | | | | | | | 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
* | | (ODBC) Handle drivers that return SQL_NO_DATA for exec success.Bill King2010-01-051-1/+6
|/ / | | | | | | | | | | | | | | | | 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
* | (OCI) Fixes problem with clobs being handled as binaryBill King2009-12-171-2/+2
| | | | | | | | | | | | | | CLOB/NCLOB/LONG are actually strings, so treat them as such. Task-number: QTBUG-4461 Reviewed-by: Justin McPherson
generated by cgit v0.12 at 2024-11-24 02:00:10 (GMT)