From 47a134b9a9136dc961dc5dd07e345aeb94b2d401 Mon Sep 17 00:00:00 2001
From: Michael Goddard <michael.goddard@nokia.com>
Date: Thu, 3 Feb 2011 12:33:27 +1000
Subject: 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
---
 src/sql/drivers/oci/qsql_oci.h | 6 +++---
 1 file 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;
-- 
cgit v0.12