QAbstractProxyModel: fix binding loops

... by using valueBypassingBindings() when accessing the properties
from the setters.

This commit is mostly trivial.
Had to change the template parameters in the unit-test, because the
updated QTestPrivate::testReadWritePropertyBasics() creates an instance
of the TestedClass, and QAbstractProxyModel cannot be instantiated,
since it has pure virtual methods.

Task-number: QTBUG-116346
Pick-to: 6.6 6.5
Change-Id: I0cae29263ea9bb92c9de06891b0ba8633fb9fd72
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

1 files changed, 3 insertions, 3 deletions

diff --git a/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp b/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp
index d04d148fc3..4a9606d345 100644
--- a/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp
+++ b/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp
@@ -610,7 +610,7 @@ void tst_QAbstractProxyModel::sourceModelBinding()
     SubQAbstractProxyModel proxy;
     QStandardItemModel model1;
     QStandardItemModel model2;
-    QTestPrivate::testReadWritePropertyBasics<QAbstractProxyModel, QAbstractItemModel *>(
+    QTestPrivate::testReadWritePropertyBasics<SubQAbstractProxyModel, QAbstractItemModel *>(
             proxy, &model1, &model2, "sourceModel");
     if (QTest::currentTestFailed()) {
         qDebug("Failed model - model test");
@@ -618,7 +618,7 @@ void tst_QAbstractProxyModel::sourceModelBinding()
     }
 
     proxy.setSourceModel(&model2);
-    QTestPrivate::testReadWritePropertyBasics<QAbstractProxyModel, QAbstractItemModel *>(
+    QTestPrivate::testReadWritePropertyBasics<SubQAbstractProxyModel, QAbstractItemModel *>(
             proxy, &model1, nullptr, "sourceModel");
     if (QTest::currentTestFailed()) {
         qDebug("Failed model - nullptr test");
@@ -626,7 +626,7 @@ void tst_QAbstractProxyModel::sourceModelBinding()
     }
 
     proxy.setSourceModel(&model1);
-    QTestPrivate::testReadWritePropertyBasics<QAbstractProxyModel, QAbstractItemModel *>(
+    QTestPrivate::testReadWritePropertyBasics<SubQAbstractProxyModel, QAbstractItemModel *>(
             proxy, nullptr, &model2, "sourceModel");
     if (QTest::currentTestFailed()) {
         qDebug("Failed nullptr - model test");