diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-26 10:25:14 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-11-26 10:25:14 +0000 |
| commit | d34be3243419246d3b4966f6be8e345747723184 (patch) | |
| tree | 4ac7a8698d0a30f17f3b8f542a1f88a1fe977aa4 /src/plugins/sqldrivers/mysql/qsql_mysql.cpp | |
| parent | 011aeb131ed904d948b69d6444ff58cdbfd4990c (diff) | |
| parent | bce25a6340309938e06222663c2c7758bafab6e2 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8
Diffstat (limited to 'src/plugins/sqldrivers/mysql/qsql_mysql.cpp')
| -rw-r--r-- | src/plugins/sqldrivers/mysql/qsql_mysql.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp index eb2bddd0bd6..0bea9ebfa12 100644 --- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp +++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp @@ -1624,7 +1624,7 @@ QString QMYSQLDriver::formatValue(const QSqlField &field, bool trimStrings) cons Q_D(const QMYSQLDriver); QString r; if (field.isNull()) { - r = QLatin1String("NULL"); + r = QStringLiteral("NULL"); } else { switch(field.type()) { case QVariant::Double: |