diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-17 06:17:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-17 06:17:55 (GMT) |
| commit | 7d6af0213ab4f8797f98d0beb659fcf2f78a361b (patch) | |
| tree | f7e66a06bc6374ae52d793014f9f3729ef60a7a1 /tests | |
| parent | 608daaa6b0701cae456e1959614e70f4bd1419a2 (diff) | |
| parent | cc5ae2db39bd5cb5e7710b1b7ce1b5c92b705450 (diff) | |
| download | Qt-7d6af0213ab4f8797f98d0beb659fcf2f78a361b.zip Qt-7d6af0213ab4f8797f98d0beb659fcf2f78a361b.tar.gz Qt-7d6af0213ab4f8797f98d0beb659fcf2f78a361b.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Update FBO docs to describe how QPainter changes the GL state
(OCI) Fixes problem with clobs being handled as binary
Disable depth testing during the 2D QGLWidget::renderText()
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qsqldatabase/tst_qsqldatabase.cpp | 6 |
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, |