summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorCaroline Chao <caroline.chao@digia.com>2012-11-15 09:58:32 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-20 01:10:25 +0100
commitb98b11fa036ea301d1483df6f533ec55be727d9d (patch)
tree2f2ee5ed9d101023a149b55f2c75c395c3306e34 /src
parentadf4e54742617489d303a711c7b3fcc3086e3a1d (diff)
SQL: Fix OCI driver's compile errors.
Task-number: QTBUG-27979 Change-Id: I4ae4cdba855c05bc6fab0f845ff16a96c8119fdb Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Diffstat (limited to 'src')
-rw-r--r--src/sql/drivers/oci/qsql_oci.cpp6
-rw-r--r--src/sql/kernel/qsqlresult.h2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/sql/drivers/oci/qsql_oci.cpp b/src/sql/drivers/oci/qsql_oci.cpp
index 385a68840d..b467fdc6d2 100644
--- a/src/sql/drivers/oci/qsql_oci.cpp
+++ b/src/sql/drivers/oci/qsql_oci.cpp
@@ -82,7 +82,9 @@
//#define QOCI_DEBUG
+Q_DECLARE_OPAQUE_POINTER(OCIEnv*);
Q_DECLARE_METATYPE(OCIEnv*)
+Q_DECLARE_OPAQUE_POINTER(OCIStmt*);
Q_DECLARE_METATYPE(OCIStmt*)
QT_BEGIN_NAMESPACE
@@ -2040,8 +2042,8 @@ QVariant QOCIResult::lastInsertId() const
bool QOCIResult::execBatch(bool arrayBind)
{
QOCICols::execBatch(d, boundValues(), arrayBind);
- d->resetBindCount();
- return d->error.type() == QSqlError::NoError;
+ resetBindCount();
+ return lastError().type() == QSqlError::NoError;
}
void QOCIResult::virtual_hook(int id, void *data)
diff --git a/src/sql/kernel/qsqlresult.h b/src/sql/kernel/qsqlresult.h
index 153af92096..5037ce1dc5 100644
--- a/src/sql/kernel/qsqlresult.h
+++ b/src/sql/kernel/qsqlresult.h
@@ -132,10 +132,10 @@ protected:
virtual void setNumericalPrecisionPolicy(QSql::NumericalPrecisionPolicy policy);
QSql::NumericalPrecisionPolicy numericalPrecisionPolicy() const;
virtual bool nextResult();
+ void resetBindCount(); // HACK
private:
QSqlResultPrivate* d;
- void resetBindCount(); // HACK
private:
Q_DISABLE_COPY(QSqlResult)