diff options
| author | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2018-02-07 00:11:14 +0100 |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2018-02-09 08:47:11 +0000 |
| commit | b7e7528f78ffa97d68669a171f8d6696ad5e35f3 (patch) | |
| tree | 64e32628413ecbed8460d2fd3343a0ba91520c83 /src/qml/util | |
| parent | 2f9afadd5d9b4899397dca02588a719123ebc518 (diff) | |
VDMAbstractItemModelDataType: use column instead of 0 when accessing model
Since a QQmlAdaptorModel now supports both row and column, we should use
this information when retrieving data from an QAbstractItemModel.
Change-Id: I1e73c026695637981e72f680ec61828c944740b6
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/qml/util')
| -rw-r--r-- | src/qml/util/qqmladaptormodel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/util/qqmladaptormodel.cpp b/src/qml/util/qqmladaptormodel.cpp index f97854314e..680785420f 100644 --- a/src/qml/util/qqmladaptormodel.cpp +++ b/src/qml/util/qqmladaptormodel.cpp @@ -495,9 +495,9 @@ public: { QHash<QByteArray, int>::const_iterator it = roleNames.find(role.toUtf8()); if (it != roleNames.end()) { - return model.aim()->index(index, 0, model.rootIndex).data(*it); + return model.aim()->index(model.rowAt(index), model.columnAt(index), model.rootIndex).data(*it); } else if (role == QLatin1String("hasModelChildren")) { - return QVariant(model.aim()->hasChildren(model.aim()->index(index, 0, model.rootIndex))); + return QVariant(model.aim()->hasChildren(model.aim()->index(model.rowAt(index), model.columnAt(index), model.rootIndex))); } else { return QVariant(); } @@ -513,7 +513,7 @@ public: QVariant modelIndex(const QQmlAdaptorModel &model, int index) const override { return model - ? QVariant::fromValue(model.aim()->index(index, 0, model.rootIndex)) + ? QVariant::fromValue(model.aim()->index(model.rowAt(index), model.columnAt(index), model.rootIndex)) : QVariant(); } |