aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/qml/util')
-rw-r--r--src/qml/util/qqmladaptormodel.cpp6
-rw-r--r--src/qml/util/qqmladaptormodel_p.h2
2 files changed, 1 insertions, 7 deletions
diff --git a/src/qml/util/qqmladaptormodel.cpp b/src/qml/util/qqmladaptormodel.cpp
index f754e0e1a5..312466e46a 100644
--- a/src/qml/util/qqmladaptormodel.cpp
+++ b/src/qml/util/qqmladaptormodel.cpp
@@ -1000,7 +1000,7 @@ void QQmlAdaptorModel::invalidateModel(QQmlDelegateModel *vdm)
bool QQmlAdaptorModel::isValid() const
{
- return accessors != &qt_vdm_null_accessors || rows.isValid();
+ return accessors != &qt_vdm_null_accessors;
}
int QQmlAdaptorModel::count() const
@@ -1010,15 +1010,11 @@ int QQmlAdaptorModel::count() const
int QQmlAdaptorModel::rowCount() const
{
- if (rows.isValid())
- return rows.value;
return qMax(0, accessors->rowCount(*this));
}
int QQmlAdaptorModel::columnCount() const
{
- if (columns.isValid())
- return columns.value;
return qMax(isValid() ? 1 : 0, accessors->columnCount(*this));
}
diff --git a/src/qml/util/qqmladaptormodel_p.h b/src/qml/util/qqmladaptormodel_p.h
index 82a4ebfcf6..b706fcb5f2 100644
--- a/src/qml/util/qqmladaptormodel_p.h
+++ b/src/qml/util/qqmladaptormodel_p.h
@@ -106,8 +106,6 @@ public:
virtual void fetchMore(QQmlAdaptorModel &) const {}
};
- QQmlNullableValue<int> rows;
- QQmlNullableValue<int> columns;
const Accessors *accessors;
QPersistentModelIndex rootIndex;
QQmlListAccessor list;