Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix execution of deferred properties
When deferred properties were assigned in multiple contexts, only the outermost context was executed. Any deferred property assignments in other inner contexts were never executed. Collect the deferred data to a container to be able to execute them all. Task-number: QTBUG-63200 Change-Id: I88fab27c1f81b5188430ada086dcc19842507e99 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
- Loading branch information
J-P Nurmi
committed
Oct 18, 2017
1 parent
5a03ab8
commit 3b6eeee
Showing
11 changed files
with
162 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
import QtQml 2.0 | ||
import Test 1.0 | ||
DeferredProperties { | ||
groupProperty: QtObject { | ||
objectName: "innerobj" | ||
property bool wasCompleted: false | ||
Component.onCompleted: wasCompleted = true | ||
} | ||
QtObject { | ||
objectName: "innerlist1" | ||
property bool wasCompleted: false | ||
Component.onCompleted: wasCompleted = true | ||
} | ||
QtObject { | ||
objectName: "innerlist2" | ||
property bool wasCompleted: false | ||
Component.onCompleted: wasCompleted = true | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
import QtQml 2.0 | ||
import Test 1.0 | ||
MyDeferredProperties { | ||
groupProperty: QtObject { | ||
objectName: "outerobj" | ||
property bool wasCompleted: false | ||
Component.onCompleted: wasCompleted = true | ||
} | ||
QtObject { | ||
objectName: "outerlist1" | ||
property bool wasCompleted: false | ||
Component.onCompleted: wasCompleted = true | ||
} | ||
QtObject { | ||
objectName: "outerlist2" | ||
property bool wasCompleted: false | ||
Component.onCompleted: wasCompleted = true | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters