Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Allow literal enum to int property assignments
Previously, enum to int property assignments were considered bindings. This commit adds support for assigning enum values to int properties as enums. Note that to use an enum in QML, it must have been declared with Q_ENUMS or otherwise registered as a metatype. Enum values from the global Qt object are also usable. Task-number: QTBUG-23403 Change-Id: I50db6cae54a24400ea472bde43619d547e4ceb78 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
- Loading branch information
Chris Adams
authored and
Qt by Nokia
committed
Mar 21, 2012
1 parent
b2722ab
commit 4c9d326
Showing
3 changed files
with
84 additions
and
3 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
import QtQuick 2.0 | ||
import Qt.test 1.0 | ||
import Qt.test 1.0 as Namespace | ||
|
||
Item { | ||
// Enums from type | ||
property int a: Item.Center | ||
property int b: Item.Right | ||
|
||
// Enums from Qt | ||
property int c: Qt.blue | ||
property int d: Qt.darkRed | ||
|
||
// Enums from other type | ||
property int e: MyQmlObject.EnumValue3 | ||
property int f: MyQmlObject.EnumValue4 | ||
|
||
// Enums from namespaced other type | ||
property int h: Namespace.MyQmlObject.EnumValue3 | ||
property int i: Namespace.MyQmlObject.EnumValue4 | ||
|
||
// Count the onChanged signals to see whether | ||
// they're assigned as literals or via bindings | ||
property int ac: 0 | ||
property int bc: 0 | ||
property int cc: 0 | ||
property int dc: 0 | ||
property int ec: 0 | ||
property int fc: 0 | ||
property int hc: 0 | ||
property int ic: 0 | ||
|
||
onAChanged: ac++ | ||
onBChanged: bc++ | ||
onCChanged: cc++ | ||
onDChanged: dc++ | ||
onEChanged: ec++ | ||
onFChanged: fc++ | ||
onHChanged: hc++ | ||
onIChanged: ic++ | ||
} |
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