summaryrefslogtreecommitdiffstats
path: root/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2009-12-18 09:07:46 (GMT)
committerMartin Smith <msmith@trolltech.com>2009-12-18 09:07:46 (GMT)
commit0d212670c06ed54ac785e0bb945c792947d388f5 (patch)
treec4f6c6762ad42df463f30e05e090fa2cfa9de77a /tests/auto/qsqldatabase/tst_qsqldatabase.cpp
parent371420d5f31a04b91c01807139d49e97db040bee (diff)
parent7c1283fca1ef2e742b5794600e00edf0c3e3020f (diff)
downloadQt-0d212670c06ed54ac785e0bb945c792947d388f5.zip
Qt-0d212670c06ed54ac785e0bb945c792947d388f5.tar.gz
Qt-0d212670c06ed54ac785e0bb945c792947d388f5.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'tests/auto/qsqldatabase/tst_qsqldatabase.cpp')
-rw-r--r--tests/auto/qsqldatabase/tst_qsqldatabase.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
index cb4e103..4f89708 100644
--- a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
+++ b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
@@ -942,9 +942,9 @@ void tst_QSqlDatabase::recordOCI()
FieldDef("raw(2000)", QVariant::ByteArray, QByteArray(Q3CString("blah6")), false),
FieldDef("blob", QVariant::ByteArray, QByteArray(Q3CString("blah7"))),
#endif
-//FIXME FieldDef("clob", QVariant::CString, Q3CString("blah8")),
-//FIXME FieldDef("nclob", QVariant::CString, Q3CString("blah9")),
-//X FieldDef("bfile", QVariant::ByteArray, QByteArray(Q3CString("blah10"))),
+ FieldDef("clob", QVariant::String, QString("blah8")),
+ FieldDef("nclob", QVariant::String, QString("blah9")),
+ FieldDef("bfile", QVariant::ByteArray, QByteArray("blah10")),
intytm,
intdts,