diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-04 18:08:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-04 18:09:33 +0200 |
| commit | 9419dfe8ee45d08f09c09d3cbece511d721546f0 (patch) | |
| tree | 1c4584099fc1efb8de30cc4526ce7ebafe8a8ce9 /src/sql/models/qsqltablemodel.cpp | |
| parent | 8b5aa7b6c40d70a7ec15b3ea485f28a142fb247c (diff) | |
| parent | 8675e1c5ee7d1209784a2320f1ae3f486b1eaae4 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
src/plugins/platforms/xcb/qxcbwindow.cpp
Change-Id: Ic747c3c50e68c005b425e7a1ec2a90965527c8bd
Diffstat (limited to 'src/sql/models/qsqltablemodel.cpp')
| -rw-r--r-- | src/sql/models/qsqltablemodel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sql/models/qsqltablemodel.cpp b/src/sql/models/qsqltablemodel.cpp index 8166613e53..c0706ac22d 100644 --- a/src/sql/models/qsqltablemodel.cpp +++ b/src/sql/models/qsqltablemodel.cpp @@ -986,8 +986,8 @@ QString QSqlTableModel::orderByClause() const //we can safely escape the field because it would have been obtained from the database //and have the correct case - QString field = d->db.driver()->escapeIdentifier(f.name(), QSqlDriver::FieldName); - field.prepend(QLatin1Char('.')).prepend(d->tableName); + QString field = d->tableName + QLatin1Char('.') + + d->db.driver()->escapeIdentifier(f.name(), QSqlDriver::FieldName); field = d->sortOrder == Qt::AscendingOrder ? Sql::asc(field) : Sql::desc(field); return Sql::orderBy(field); } |