From d3f8a608e8e00915df38a2a43496127a93b5bcaf Mon Sep 17 00:00:00 2001
From: Nikita Krupenko <krnekit@gmail.com>
Date: Tue, 23 Feb 2016 17:29:45 +0200
Subject: Validate Binding only when it is enabled

Not validate binding if it is disabled and validate when it became
enabled. This helps to get read of warnings about not existing property
that started to appear since 61ce37de40711ef2d4a6b4989d8183e1711fc47d.

Task-number: QTBUG-48623
Change-Id: I4aa92896c04b146a79e606842c1d33661b3f5a70
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Tobias Koenig <tobias.koenig@kdab.com>
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
---
 src/qml/types/qqmlbind.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/qml/types/qqmlbind.cpp b/src/qml/types/qqmlbind.cpp
index 45b7edd316..2150f67366 100644
--- a/src/qml/types/qqmlbind.cpp
+++ b/src/qml/types/qqmlbind.cpp
@@ -69,7 +69,7 @@ public:
 
 void QQmlBindPrivate::validate(QObject *binding) const
 {
-    if (!obj)
+    if (!obj || (when.isValid() && !when))
         return;
 
     if (!prop.isValid()) {
@@ -179,6 +179,8 @@ void QQmlBind::setWhen(bool v)
         return;
 
     d->when = v;
+    if (v && d->componentComplete)
+        d->validate(this);
     eval();
 }
 
-- 
cgit v1.2.3