diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-03-31 12:30:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-03-31 12:30:18 +0200 |
| commit | 947e1f45c762cf6d26bc8f241833689c6e636627 (patch) | |
| tree | b6e87bd19fc5b530da279476ea0eb8ad3d1e960f /src/testlib | |
| parent | 8f88a3962a7b1716d2c0482b818d2504776ece05 (diff) | |
| parent | d934fd7f54eae24ea3f719890e2c4dbbc445049d (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
Change-Id: Ifaa56153f5f0d687a6b4d94f84fcfa1e1751afd2
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qabstractitemmodeltester.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/testlib/qabstractitemmodeltester.cpp b/src/testlib/qabstractitemmodeltester.cpp index 2e05097122..a09d007a82 100644 --- a/src/testlib/qabstractitemmodeltester.cpp +++ b/src/testlib/qabstractitemmodeltester.cpp @@ -288,6 +288,12 @@ QAbstractItemModelTester::FailureReportingMode QAbstractItemModelTester::failure return d->failureReportingMode; } +bool QAbstractItemModelTester::verify(bool statement, const char *statementStr, const char *description, const char *file, int line) +{ + Q_D(QAbstractItemModelTester); + return d->verify(statement, statementStr, description, file, line); +} + QAbstractItemModelTesterPrivate::QAbstractItemModelTesterPrivate(QAbstractItemModel *model, QAbstractItemModelTester::FailureReportingMode failureReportingMode) : model(model), failureReportingMode(failureReportingMode), |