diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2011-02-03 12:33:27 +1000 |
|---|---|---|
| committer | Michael Goddard <michael.goddard@nokia.com> | 2011-02-04 15:41:03 +1000 |
| commit | 47a134b9a9136dc961dc5dd07e345aeb94b2d401 (patch) | |
| tree | 02c11a35eb7d5b61c53bcd45ddbb70e6dd7ffdaf /src/sql/drivers | |
| parent | bdd4a9149789f60974603e1f7621d51378f0a108 (diff) | |
| download | qt4-tools-47a134b9a9136dc961dc5dd07e345aeb94b2d401.tar.gz | |
Namespace compilation - OCI typedefs should be outside Qt namespace.
psql, sqlite2 drivers already do this correctly.
Change-Id: I1f02401432d5c39fa1572e2f6255941b8a67e591
Task-number: QTBUG-17076
Reviewed-by: Charles Yin
Diffstat (limited to 'src/sql/drivers')
| -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 51fd14cd22..22bd78dffd 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; |