diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-09-04 12:01:00 +0300 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-09-04 12:01:00 +0300 |
| commit | 402b26efc6903741655bcc42bc777f73c6fbc5ab (patch) | |
| tree | f65d033a3cbf1e840d651bb5ce7ca7cfc4b0d990 /tests/auto/modelview/tst_modelview.cpp | |
| parent | 37189eee9cbdef8d973b04ed363bfb55480fd0c8 (diff) | |
| parent | 9ec7a871082800d1af189236f99b67e4d564a966 (diff) | |
Merge dev into 5.14 (delayed final downmerge)
This replicates the effects of the fast-forward merge that should have
been pushed on 2019-08-27 as the final down-merge from dev to 5.14.
Task-number: QTBUG-78019
Change-Id: Iccd04fa361959ba0711f41bf20ff3d064065ed7e
Diffstat (limited to 'tests/auto/modelview/tst_modelview.cpp')
| -rw-r--r-- | tests/auto/modelview/tst_modelview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/modelview/tst_modelview.cpp b/tests/auto/modelview/tst_modelview.cpp index da42763..78e75ca 100644 --- a/tests/auto/modelview/tst_modelview.cpp +++ b/tests/auto/modelview/tst_modelview.cpp @@ -733,7 +733,7 @@ void TestModelView::testFlags() for (int i = 10; i < 20; ++i) { QStandardItem* firstItem = m_sourceModel.item(i, 0); QStandardItem* secondItem = m_sourceModel.item(i, 1); - firstItem->setFlags(firstItem->flags() | Qt::ItemIsEnabled | Qt::ItemIsTristate); + firstItem->setFlags(firstItem->flags() | Qt::ItemIsEnabled | Qt::ItemIsAutoTristate); secondItem->setFlags(firstItem->flags() | Qt::ItemIsEnabled); } bool signalsReceived = false; |