diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-01 14:17:44 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-01 14:17:52 +0100 |
| commit | 23712c568072422e49d41f039ad72c92fd117afe (patch) | |
| tree | 423e84c8802074f9daa5422eb5c8c49b3074516a /src/qml/types/qqmlbind.cpp | |
| parent | ab2c5be35dd8f339ec39f52364625a53fa6d0ded (diff) | |
| parent | 2b55b531b095a991376a26599d503223a67ae946 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/qmltooling/qmldbg_native/qmldbg_native.pro
Change-Id: I3ca8f0422828191b7e19539c25f31f2d048e9f18
Diffstat (limited to 'src/qml/types/qqmlbind.cpp')
| -rw-r--r-- | src/qml/types/qqmlbind.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qml/types/qqmlbind.cpp b/src/qml/types/qqmlbind.cpp index e2063dee7d..ed9a8533c0 100644 --- a/src/qml/types/qqmlbind.cpp +++ b/src/qml/types/qqmlbind.cpp @@ -75,7 +75,7 @@ public: void QQmlBindPrivate::validate(QObject *binding) const { - if (!obj) + if (!obj || (when.isValid() && !when)) return; if (!prop.isValid()) { @@ -185,6 +185,8 @@ void QQmlBind::setWhen(bool v) return; d->when = v; + if (v && d->componentComplete) + d->validate(this); eval(); } |