diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-12-17 23:46:27 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-12-17 23:46:27 (GMT) |
| commit | a60c9a1ff41e5ca1482121ff3f89a112b359b6d4 (patch) | |
| tree | ebe4f5e941eb3bda28593c2b170101867cb0afe3 /src/sql/drivers/oci/qsql_oci.cpp | |
| parent | 412920402f488c2cf6eb81e7582f9b5aa7b06680 (diff) | |
| parent | b8a4b365b1105a742369bbaa5dc00e43914089e0 (diff) | |
| download | Qt-a60c9a1ff41e5ca1482121ff3f89a112b359b6d4.zip Qt-a60c9a1ff41e5ca1482121ff3f89a112b359b6d4.tar.gz Qt-a60c9a1ff41e5ca1482121ff3f89a112b359b6d4.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
.gitignore
tests/benchmarks/benchmarks.pro
Diffstat (limited to 'src/sql/drivers/oci/qsql_oci.cpp')
| -rw-r--r-- | src/sql/drivers/oci/qsql_oci.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sql/drivers/oci/qsql_oci.cpp b/src/sql/drivers/oci/qsql_oci.cpp index f130087..a384ba0 100644 --- a/src/sql/drivers/oci/qsql_oci.cpp +++ b/src/sql/drivers/oci/qsql_oci.cpp @@ -517,7 +517,7 @@ QVariant::Type qDecodeOCIType(const QString& ocitype, QSql::NumericalPrecisionPo } else if (ocitype == QLatin1String("LONG") || ocitype == QLatin1String("NCLOB") || ocitype == QLatin1String("CLOB")) - type = QVariant::ByteArray; + type = QVariant::String; else if (ocitype == QLatin1String("RAW") || ocitype == QLatin1String("LONG RAW") || ocitype == QLatin1String("ROWID") || ocitype == QLatin1String("BLOB") || ocitype == QLatin1String("CFILE") || ocitype == QLatin1String("BFILE")) @@ -543,6 +543,7 @@ QVariant::Type qDecodeOCIType(int ocitype, QSql::NumericalPrecisionPolicy precis case SQLT_AVC: case SQLT_RDD: case SQLT_LNG: + case SQLT_CLOB: #ifdef SQLT_INTERVAL_YM case SQLT_INTERVAL_YM: #endif @@ -584,7 +585,6 @@ QVariant::Type qDecodeOCIType(int ocitype, QSql::NumericalPrecisionPolicy precis case SQLT_NTY: case SQLT_REF: case SQLT_RID: - case SQLT_CLOB: type = QVariant::ByteArray; break; case SQLT_DAT: |