diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 18:41:27 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 20:43:50 +0100 |
| commit | c2f167b41284cee3570434deba85f26f14ff241f (patch) | |
| tree | b0f52f86a8df266547d7ec7afa22d0c0d68d3532 /src/plugins/sqldrivers/mysql/qsql_mysql.cpp | |
| parent | 9f9049b486a47aef0c7e2e3852b20aa4ffdce748 (diff) | |
| parent | ff922e7b87de147797fbd759167878aec7625f0c (diff) | |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'src/plugins/sqldrivers/mysql/qsql_mysql.cpp')
| -rw-r--r-- | src/plugins/sqldrivers/mysql/qsql_mysql.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp index 4e2698760f..78e94ba070 100644 --- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp +++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp @@ -294,6 +294,7 @@ static QMetaType::Type qDecodeMYSQLType(int mysqltype, uint flags) case FIELD_TYPE_TINY_BLOB : case FIELD_TYPE_MEDIUM_BLOB : case FIELD_TYPE_LONG_BLOB : + case FIELD_TYPE_GEOMETRY : type = (flags & BINARY_FLAG) ? QMetaType::QByteArray : QMetaType::QString; break; default: |