summaryrefslogtreecommitdiff
path: root/src/sql/drivers
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright headersAkseli Salovaara2015-03-3120-260/+260
| | | | | | | | | 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>
* Fix - psql driver must format qdatetime using isoCristian Tarsoaga2014-05-051-2/+2
| | | | | | | | 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>
* Fix access of tmpStorage in QODBCResult::exec().Friedemann Kleint2014-04-071-27/+22
| | | | | | | | | | | | | 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>
* Updated year in copyright headerKai Koehne2014-03-2620-20/+20
| | | | | | | | | | | | | | | | | | 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>
* Fix QByteArray memory corruption in QIBaseDriver::open().Friedemann Kleint2014-03-191-20/+15
| | | | | | | | | | | 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)
* postgresql driver: escape backslashes only when server requires itMark Brand2013-05-281-5/+33
| | | | | | | | | | | | 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>
* qsql_odbc: fix SQLGetStmtAtt usageMark Brand2013-04-241-5/+3
| | | | | | | | | | | | | | | | | | | | 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)
* ODBC: lost info about column metadata on SQL_NO_DATAIsrael Lins2013-04-241-5/+0
| | | | | | | | | | 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>
* ODBC: fixed consistence of return of QODBCResult::exec()Israel Lins2013-04-241-1/+1
| | | | | | | | | | | | 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>
* ODBC: fix loss of milliseconds when binding QDateTimeIsrael Lins2013-04-241-1/+1
| | | | | | | | | | | | 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>
* Fix for Sql query aliases with dotsMarko Kangas2013-04-231-2/+1
| | | | | | | | | | | 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>
* Add support for SQLSTATE error codesAndras Mantia2013-02-281-12/+18
| | | | | | | | | | | | | | | 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>
* Fix DB2 driver X64 Linux BuildKarim Pinter2013-02-241-1/+1
| | | | | | | | | | 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>
* don't prematurely reduce LIBS when adding sql link listsMark Brand2013-01-294-4/+4
| | | | | | | | | | | 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)
* Fix postgres notification support in the QPSQLDriver.Matt Newell2013-01-271-37/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1320-20/+20
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fix error reporting in TDS SQL driver.Aaron McCarthy2012-11-231-2/+4
| | | | | | | | | | | | | | | | | | | | | 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>
* fix binding of bool type in mysql driverMark Brand2012-11-131-1/+6
| | | | | | | | | | | | | | | | | | | 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))
* Fix error when inserting to tables with datetime fields with QODBCThiago A. Correa2012-10-081-4/+42
| | | | | | | | | | | | | | 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 from Nokia to DigiaIikka Eklund2012-09-2920-480/+480
| | | | | | | | 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>
* Update contact information in license headers.Sergio Ahumada2012-08-0120-40/+40
| | | | | | | | | | | | | - 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>
* Fix memory leak in 64-bits ODBC driverHonglei Zhang2012-04-271-1/+2
| | | | | | | | | 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>
* Fix for memory leak in 64 bit ODBC driver's call to SQLGetStmtAttr()Yan Shapochnik2012-04-201-1/+2
| | | | | | | | | | | | | 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>
* Memory leak fix of sqlite driver when close failedHonglei Zhang2012-04-031-0/+8
| | | | | | | | | | | | | | 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>
* Improve type detection for query resultsAndy Shaw2012-03-121-4/+29
| | | | | | | | | | | | | | | 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)
* Handle the 'real' datatype correctly in the SQLite driverAndy Shaw2012-01-261-0/+1
| | | | | | | | | | | | | 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>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1120-20/+20
| | | | | | | | | 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>
* Revert "Fix sqlite driver memory eating due to close failure"Sinan Tanilkan2011-12-071-7/+0
| | | | | | Introduced a problem for the SDK (QTBUG-23036). This reverts commit 9a5fb6bd5f0fb3b37897bf722e4cc1673309623c.
* Fix sqlite driver memory eating due to close failureHonglei Zhang2011-11-301-0/+7
| | | | | | | | | | | | | 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
* QSQLITE support only one statement at a timeHonglei Zhang2011-11-301-2/+9
| | | | | | | | | | 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
* retreving -> retrievingAlbert Astals Cid2011-09-281-3/+3
| | | | | | | Reported by Freek de Kruijf in KDE translation project Merge-request: 1405 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Added correct licence headers to symsql source filesTimo Kauppinen2011-09-212-36/+36
| | | | | Task-number: QT-4860 Reviewed-by: Honglei Zhang
* Release Symbian SQL driverHonglei Zhang2011-09-211-175/+124
| | | | | | | | | | 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
* Fixed a typo found by static checkerTimo Kauppinen2011-09-211-1/+1
| | | | | Task-number: QT-4860 Reviewd-by: Honglei Zhang
* Added SQL driver plugin implementation for Symbian.Timo Kauppinen2011-09-213-0/+1373
| | | | | | | 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
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1318-306/+306
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-291-2/+6
|\
| * Fixed QTBUG-11935 : "With MySQL version > 50000 the QMYSQLDriver::Emmanuel BOURGERIE2011-04-271-4/+4
| | | | | | | | | | | | | | | | | | | | tables() returns tables in all databases on the server" This bugfix has been rewritten to match contributors advise. Change-Id: I3a9cf900ff7eae47c9ffdbcf34bcb1b4396d9837 Merge-request: 1010 Reviewed-by: Charles Yin <charles.yin@nokia.com>
| * Fixed QTBUG-11935Emmanuel BOURGERIE2011-04-271-2/+6
| | | | | | | | | | | | Change-Id: Ia7bdb0ceecf2892f6be73d1816764a2bab6275f1 Merge-request: 1010 Reviewed-by: Charles Yin <charles.yin@nokia.com>
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-101-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/development/qmake-manual.qdoc mkspecs/symbian-gcce/qmake.conf qmake/project.cpp src/corelib/global/qnamespace.qdoc src/declarative/graphicsitems/qdeclarativetext.cpp src/gui/text/qtextdocumentlayout.cpp src/gui/text/qtextdocumentlayout_p.h tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp tests/auto/networkselftest/networkselftest.pro tests/auto/qscriptengine/tst_qscriptengine.cpp tools/designer/src/components/signalsloteditor/signalslot_utils.cpp tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| * Namespace compilation - OCI typedefs should be outside Qt namespace.Michael Goddard2011-02-041-3/+3
| | | | | | | | | | | | | | | | psql, sqlite2 drivers already do this correctly. Change-Id: I1f02401432d5c39fa1572e2f6255941b8a67e591 Task-number: QTBUG-17076 Reviewed-by: Charles Yin
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-012-1/+7
|\ \ | |/ | | | | | | | | Conflicts: mkspecs/features/symbian/application_icon.prf src/sql/drivers/odbc/qsql_odbc.cpp
| * Fix warnings in PSQL driver: handle VersionUnknown in switchThiago Macieira2011-01-261-0/+6
| |
| * Fix warning in ODBC driver: passing NULL to non-pointer.Thiago Macieira2011-01-261-2/+2
| | | | | | | | | | Warning was: passing NULL to non-pointer argument 7 of 'SQLRETURN SQLGetDiagRecW(SQLSMALLINT, void*, SQLSMALLINT, SQLWCHAR*, SQLINTEGER*, SQLWCHAR*, SQLSMALLINT, SQLSMALLINT*)'
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1718-18/+18
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-1118-18/+18
| | | | | | | | Reviewed-by: Trust Me
* | fix two more "comparison between signed and unsigned integer expressions" ↵Konstantin Ritt2011-01-111-2/+2
| | | | | | | | | | | | | | | | | | warnings SQLLEN is unnecessarily an unsigned int Merge-request: 955 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-252-36/+86
|\ \ | |/
| * Add Postgresql 8.x and 9 supportsCharles Yin2010-12-232-36/+86
| | | | | | | | | | | | Change-Id: Ic740686ead768cc3e106703049d878549dfd3c6a Task-number:QTBUG-14206 Reviewed-by: Michael Goddard
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-121-67/+172
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure doc/src/snippets/code/doc_src_qmake-manual.qdoc mkspecs/features/symbian/application_icon.prf mkspecs/features/symbian/default_post.prf mkspecs/features/symbian/symbian_building.prf qmake/generators/symbian/initprojectdeploy_symbian.cpp src/multimedia/audio/audio.pri src/network/access/qnetworkaccessmanager.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl_p.h src/plugins/bearer/corewlan/qcorewlanengine.mm src/plugins/phonon/mmf/mmf.pro tests/auto/qscriptvalue/tst_qscriptvalue.cpp tests/auto/qscriptvalue/tst_qscriptvalue.h tools/qdoc3/doc/qdoc-manual.qdocconf
View Lorry Controller Status