diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-06 19:30:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-06 19:30:48 (GMT) |
| commit | 8a390046adddb8df3ddcf3a421f6f547e6cfe7aa (patch) | |
| tree | 8b8879cea103c26956067adf2e66dfaf7edeea0c /src/sql/models/qsqlrelationaltablemodel.cpp | |
| parent | e1a6e877e5d3acfb29b291e946e836fbe3e25cb9 (diff) | |
| parent | 3b6324bf11f31d09424297c5e789e5ce4f0afbb7 (diff) | |
| download | Qt-8a390046adddb8df3ddcf3a421f6f547e6cfe7aa.zip Qt-8a390046adddb8df3ddcf3a421f6f547e6cfe7aa.tar.gz Qt-8a390046adddb8df3ddcf3a421f6f547e6cfe7aa.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Symbian: allow apps to disable GL multisampling
QSqlRelationalTableModel doesn't follow relations on the first column
symbian - don't export qsymbianbearer.qtplugin twice
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 0edfaf4..c5764a7 100644 --- a/src/sql/models/qsqlrelationaltablemodel.cpp +++ b/src/sql/models/qsqlrelationaltablemodel.cpp @@ -430,7 +430,7 @@ QVariant QSqlRelationalTableModel::data(const QModelIndex &index, int role) cons { Q_D(const QSqlRelationalTableModel); - if (role == Qt::DisplayRole && index.column() > 0 && index.column() < d->relations.count() && + if (role == Qt::DisplayRole && index.column() >= 0 && index.column() < d->relations.count() && d->relations.value(index.column()).isValid()) { QRelation &relation = d->relations[index.column()]; if (!relation.isDictionaryInitialized()) |