diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-06-22 23:18:10 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-06-22 23:18:10 (GMT) |
| commit | c7fcd4b772092cf0764cfd97463c3aa3d7cc9e9f (patch) | |
| tree | 836c2dacbfa3d55c07ab8242f57efd79e3deeeec /src/sql/drivers/mysql/qsql_mysql.cpp | |
| parent | 631351d8b5699520267a80599a57e27f97b53d23 (diff) | |
| parent | 308ed3913b406c43dfdab4fa734a332863dc4cbc (diff) | |
| download | Qt-c7fcd4b772092cf0764cfd97463c3aa3d7cc9e9f.zip Qt-c7fcd4b772092cf0764cfd97463c3aa3d7cc9e9f.tar.gz Qt-c7fcd4b772092cf0764cfd97463c3aa3d7cc9e9f.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'src/sql/drivers/mysql/qsql_mysql.cpp')
| -rw-r--r-- | src/sql/drivers/mysql/qsql_mysql.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp index 46726a5..bfd65fc 100644 --- a/src/sql/drivers/mysql/qsql_mysql.cpp +++ b/src/sql/drivers/mysql/qsql_mysql.cpp @@ -254,6 +254,9 @@ static QVariant::Type qDecodeMYSQLType(int mysqltype, uint flags) case FIELD_TYPE_FLOAT : case FIELD_TYPE_DOUBLE : case FIELD_TYPE_DECIMAL : +#if defined(FIELD_TYPE_NEWDECIMAL) + case FIELD_TYPE_NEWDECIMAL: +#endif type = QVariant::Double; break; case FIELD_TYPE_DATE : |