diff options
author | Paul Wicking <paul.wicking@qt.io> | 2019-02-01 13:33:25 +0100 |
---|---|---|
committer | Paul Wicking <paul.wicking@qt.io> | 2019-02-01 13:33:26 +0100 |
commit | 2bc362c9fa37455afbeb56e5f1852188ede3eab4 (patch) | |
tree | b89e3c2c082a0285e8cd91733ddbc772fe4362a5 /src/sql/models/qsqlrelationaltablemodel.cpp | |
parent | 5de981d3bc3df874f9df35a6899345f4f61fa951 (diff) | |
parent | 481db443d502c8ebc169b7256cb696428cf02199 (diff) |
Merge dev into 5.13
Change-Id: I8113c6d8735a151bd152e6096f8c8b8e63a05474
Diffstat (limited to 'src/sql/models/qsqlrelationaltablemodel.cpp')
-rw-r--r-- | src/sql/models/qsqlrelationaltablemodel.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/sql/models/qsqlrelationaltablemodel.cpp b/src/sql/models/qsqlrelationaltablemodel.cpp index 1f590c4ab2..34be010474 100644 --- a/src/sql/models/qsqlrelationaltablemodel.cpp +++ b/src/sql/models/qsqlrelationaltablemodel.cpp @@ -626,8 +626,8 @@ QString QSqlRelationalTableModel::selectStatement() const /*! Returns a QSqlTableModel object for accessing the table for which - \a column is a foreign key, or 0 if there is no relation for the - given \a column. + \a column is a foreign key, or \nullptr if there is no relation for + the given \a column. The returned object is owned by the QSqlRelationalTableModel. @@ -636,12 +636,12 @@ QString QSqlRelationalTableModel::selectStatement() const QSqlTableModel *QSqlRelationalTableModel::relationModel(int column) const { Q_D(const QSqlRelationalTableModel); - if ( column < 0 || column >= d->relations.count()) - return 0; + if (column < 0 || column >= d->relations.count()) + return nullptr; QRelation &relation = const_cast<QSqlRelationalTableModelPrivate *>(d)->relations[column]; if (!relation.isValid()) - return 0; + return nullptr; if (!relation.model) relation.populateModel(); |