diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:03:19 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 14:21:45 +0200 |
commit | fb7cdefef82d34f7bdbf98ec9187cc05280c39ae (patch) | |
tree | f224c6d3e2a6a2e842bb3d7e826ddd7417d832bc /tests | |
parent | d04b169dceb451507cc642dc9b1e26e3f34bafff (diff) | |
parent | c973a6eb63b52db6bcb4c15854797228903fc756 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: Ia376610d1350e3d22edc3714f90e593691a5095d
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/modelview/tst_modelview.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/auto/modelview/tst_modelview.cpp b/tests/auto/modelview/tst_modelview.cpp index 1512f10..2a8ddcb 100644 --- a/tests/auto/modelview/tst_modelview.cpp +++ b/tests/auto/modelview/tst_modelview.cpp @@ -89,10 +89,6 @@ struct InsertedRow : m_index(index) , m_start(start) , m_end(end){} - InsertedRow(const InsertedRow &other) - : m_index(other.m_index) - , m_start(other.m_start) - , m_end(other.m_end){} bool match(const QList<QVariant> &signal) const { if (signal.size() != 3) |