diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-12-08 09:10:52 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-12-08 09:10:52 (GMT) |
| commit | 3f5e4ed4d2b110f4c6e952b74c9f852a2dc14a54 (patch) | |
| tree | bdd95d791244c6cc72a19a48118ab72ff5edcfb2 /src/sql/models/qsqlrelationaltablemodel.cpp | |
| parent | 55be2d1d684d4505db3bbf76da0cf8326cee9468 (diff) | |
| parent | dfbdb86fd4614be9be17cbfb602ed5a3b5a38671 (diff) | |
| download | Qt-3f5e4ed4d2b110f4c6e952b74c9f852a2dc14a54.zip Qt-3f5e4ed4d2b110f4c6e952b74c9f852a2dc14a54.tar.gz Qt-3f5e4ed4d2b110f4c6e952b74c9f852a2dc14a54.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/sql/models/qsqlrelationaltablemodel.cpp')
| -rw-r--r-- | src/sql/models/qsqlrelationaltablemodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sql/models/qsqlrelationaltablemodel.cpp b/src/sql/models/qsqlrelationaltablemodel.cpp index 5f0a35d..aec54d6 100644 --- a/src/sql/models/qsqlrelationaltablemodel.cpp +++ b/src/sql/models/qsqlrelationaltablemodel.cpp @@ -563,7 +563,7 @@ QString QSqlRelationalTableModel::selectStatement() const // If there are duplicate field names they must be aliased if (fieldNames.value(fieldList[i]) > 1) { - QString relTableName = relation.tableName(); + QString relTableName = relation.tableName().section(QChar::fromLatin1('.'), -1, -1); if (d->db.driver()->isIdentifierEscaped(relTableName, QSqlDriver::TableName)) relTableName = d->db.driver()->stripDelimiters(relTableName, QSqlDriver::TableName); QString displayColumn = relation.displayColumn(); |