summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qproperty.h
diff options
context:
space:
mode:
authorFabian Kosmale <fabian.kosmale@qt.io>2020-12-01 12:01:06 +0100
committerFabian Kosmale <fabian.kosmale@qt.io>2020-12-01 15:06:35 +0100
commitb21dba98e3e557eece0497aeea0f0beb70cc62da (patch)
treeb453446812b398d0d6dcafbcc90548b6b689c485 /src/corelib/kernel/qproperty.h
parentcea8b5832c56e92aba2b028afc965ddcf384d37b (diff)
QProperty: Avoid spurious dependencies by suspending binding state
Avoid spurious bindings by resetting the binding state before calling the setter of eager properties. Fixes: QTBUG-88999 Pick-to: 6.0 Change-Id: I1e3b5662307d906598335a21d306be9c606529d4 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/kernel/qproperty.h')
-rw-r--r--src/corelib/kernel/qproperty.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qproperty.h b/src/corelib/kernel/qproperty.h
index e9e0e37f3c..946014dc6d 100644
--- a/src/corelib/kernel/qproperty.h
+++ b/src/corelib/kernel/qproperty.h
@@ -783,13 +783,13 @@ public:
namespace QtPrivate {
struct BindingEvaluationState;
-struct CurrentCompatProperty;
+struct CompatPropertySafePoint;
}
struct QBindingStatus
{
QtPrivate::BindingEvaluationState *currentlyEvaluatingBinding = nullptr;
- QtPrivate::CurrentCompatProperty *currentCompatProperty = nullptr;
+ QtPrivate::CompatPropertySafePoint *currentCompatProperty = nullptr;
};
struct QBindingStorageData;