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 /src/sql/drivers/oci/qsql_oci.h | |
| 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 'src/sql/drivers/oci/qsql_oci.h')
| -rw-r--r-- | src/sql/drivers/oci/qsql_oci.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sql/drivers/oci/qsql_oci.h b/src/sql/drivers/oci/qsql_oci.h index 51fd14c..22bd78d 100644 --- a/src/sql/drivers/oci/qsql_oci.h +++ b/src/sql/drivers/oci/qsql_oci.h @@ -54,6 +54,9 @@ QT_BEGIN_HEADER +typedef struct OCIEnv OCIEnv; +typedef struct OCISvcCtx OCISvcCtx; + QT_BEGIN_NAMESPACE class QOCIDriver; @@ -61,9 +64,6 @@ class QOCICols; struct QOCIDriverPrivate; struct QOCIResultPrivate; -typedef struct OCIEnv OCIEnv; -typedef struct OCISvcCtx OCISvcCtx; - class Q_EXPORT_SQLDRIVER_OCI QOCIResult : public QSqlCachedResult { friend class QOCIDriver; |