diff options
| -rw-r--r-- | src/qml/util/qqmladaptormodel.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/quick/qquicktableview/testmodel.h | 1 | ||||
| -rw-r--r-- | tests/auto/quick/qquicktableview/tst_qquicktableview.cpp | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/qml/util/qqmladaptormodel.cpp b/src/qml/util/qqmladaptormodel.cpp index 2b50a0867c..831663fb7b 100644 --- a/src/qml/util/qqmladaptormodel.cpp +++ b/src/qml/util/qqmladaptormodel.cpp @@ -990,7 +990,7 @@ int QQmlAdaptorModel::rowCount() const int QQmlAdaptorModel::columnCount() const { - return qMax(isValid() ? 1 : 0, accessors->columnCount(*this)); + return qMax(0, accessors->columnCount(*this)); } int QQmlAdaptorModel::rowAt(int index) const diff --git a/tests/auto/quick/qquicktableview/testmodel.h b/tests/auto/quick/qquicktableview/testmodel.h index 28ea466b82..b1bb7a41b8 100644 --- a/tests/auto/quick/qquicktableview/testmodel.h +++ b/tests/auto/quick/qquicktableview/testmodel.h @@ -133,6 +133,7 @@ public: beginResetModel(); m_rows = 0; m_columns = 0; + modelData.clear(); endResetModel(); } diff --git a/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp b/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp index 60b938d127..38789fd7bf 100644 --- a/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp +++ b/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp @@ -1466,6 +1466,7 @@ void tst_QQuickTableView::modelSignals() QCOMPARE(tableView->columns(), 10); model.clear(); + model.setColumnCount(1); WAIT_UNTIL_POLISHED; QCOMPARE(tableView->rows(), 0); QCOMPARE(tableView->columns(), 1); |