diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2011-02-03 02:33:27 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2011-02-08 15:26:37 (GMT) |
| commit | 8d284e23c17c268c97ac226760265d1168320658 (patch) | |
| tree | eea5c85bc332f73620b486ef7b7baab40635a37e | |
| parent | e1161c6fd35249a938808d107cf5900cb07523ed (diff) | |
| download | Qt-8d284e23c17c268c97ac226760265d1168320658.zip Qt-8d284e23c17c268c97ac226760265d1168320658.tar.gz Qt-8d284e23c17c268c97ac226760265d1168320658.tar.bz2 | |
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
(cherry picked from commit 47a134b9a9136dc961dc5dd07e345aeb94b2d401)
| -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; |