diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-04 22:03:21 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-04 22:03:21 (GMT) |
| commit | 4e458b9241dbafd8d39b7bdca1ecddee8b89b39b (patch) | |
| tree | 91df1d39a6d23b2748da13a129ee417dcc035417 /doc/src | |
| parent | f018d9236647b687e03dd9d2e1867944b4f4058b (diff) | |
| parent | e9ab35ef663e9562385c974dcbeb7cf2d03ab70f (diff) | |
| download | Qt-4e458b9241dbafd8d39b7bdca1ecddee8b89b39b.zip Qt-4e458b9241dbafd8d39b7bdca1ecddee8b89b39b.tar.gz Qt-4e458b9241dbafd8d39b7bdca1ecddee8b89b39b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Move the QtHelp tests in its own profile
Namespace compilation - OCI typedefs should be outside Qt namespace.
Fix some removeRows issues with QSqlTableModel.
Mention the requirement for OCI when building the SQL oracle driver.
Try to document that invalid database arguments use the default database.
Update some documentation about what happens with select()/setQuery().
Make sure that setRecord emits dataChanged() with OnManualSubmit.
QSqlTableModel/QSqlQueryModel and insertColumns problem.
tst_qsvgrenderer: works on shadowbuild
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/sql-programming/sql-driver.qdoc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/src/sql-programming/sql-driver.qdoc b/doc/src/sql-programming/sql-driver.qdoc index 1476491..a4bcb97 100644 --- a/doc/src/sql-programming/sql-driver.qdoc +++ b/doc/src/sql-programming/sql-driver.qdoc @@ -314,7 +314,9 @@ \section3 How to Build the OCI Plugin on Windows Choosing the option "Programmer" in the Oracle Client Installer from - the Oracle Client Installation CD is sufficient to build the plugin. + the Oracle Client Installation CD is generally sufficient to build the + plugin. For some versions of Oracle Client, you may also need to select + the "Call Interface (OCI)" option if it is available. Build the plugin as follows (here it is assumed that Oracle Client is installed in \c{C:\oracle}): |