diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-05-27 06:37:41 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-05-27 06:37:41 (GMT) |
| commit | 0f932c13de7791246c1b30a8fed95a78867dde55 (patch) | |
| tree | b586e953a014cfa73816dba52ded0f6ea683ab8a | |
| parent | 33368fa3541fb38c3afc1d525da2cd837f2920a1 (diff) | |
| download | Qt-0f932c13de7791246c1b30a8fed95a78867dde55.zip Qt-0f932c13de7791246c1b30a8fed95a78867dde55.tar.gz Qt-0f932c13de7791246c1b30a8fed95a78867dde55.tar.bz2 | |
Fixed qsqldatabase test case compilation.
Unterminated `#if_ conditional, probably due to bad merge
| -rw-r--r-- | tests/auto/qsqldatabase/tst_qsqldatabase.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp index 66cf81f..4fa3dc4 100644 --- a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp +++ b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp @@ -1058,7 +1058,6 @@ void tst_QSqlDatabase::recordMySQL() specifically: Before MySQL 5.0.15, the pad value is space. Values are right-padded with space on insert, and trailing spaces are removed on select. */ -#ifdef QT3_SUPPORT if ( major >5 || ( major == 5 && minor > 0) || ( major == 5 && minor == 0 && revision >= 15) ) { bin10 = FieldDef("binary(10)", QVariant::ByteArray, QByteArray(Q3CString("123abc "))); varbin10 = FieldDef("varbinary(10)", QVariant::ByteArray, QByteArray(Q3CString("123abcv "))); |