diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-07 00:12:04 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-07 00:12:04 (GMT) |
| commit | 35e6100977e496a242c41f6f0fc66889e7cd49fc (patch) | |
| tree | bc5b363b92934708167a0e44e4617f01eb6485b4 /examples/declarative/fonts/fonts.qml | |
| parent | d6cb7c903069e1dfde3ffc69649354c97d160b68 (diff) | |
| parent | 9439d7475e7ba558a5b455a8f2b7f90adf26db79 (diff) | |
| download | Qt-35e6100977e496a242c41f6f0fc66889e7cd49fc.zip Qt-35e6100977e496a242c41f6f0fc66889e7cd49fc.tar.gz Qt-35e6100977e496a242c41f6f0fc66889e7cd49fc.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (118 commits)
Avoid repeated create/destroy at top list boundary with sub-pixel movement.
Call QDeclarativeItem::geometryChanged() base implementation
qdoc fixes.
Avoid warnings as delegates with bindings to parent are created and destroyed.
qdoc fixes
TextInput echoMode doc.
Make sure to call base class implementation.
More cleanup
Cleanup
Cleanup
Use enum for drag.axis in doc and examples.
Add missing test file.
Fix autotest
Add QML_XHR_DUMP option
Compile
doc fixes
Doc: more clarification of cacheBuffer
Fix some compiler warnings.
Another initialization fix. Unleak.
Fix compile in namespace.
...
Diffstat (limited to 'examples/declarative/fonts/fonts.qml')
| -rw-r--r-- | examples/declarative/fonts/fonts.qml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/declarative/fonts/fonts.qml b/examples/declarative/fonts/fonts.qml index ae31b03..f3eac48 100644 --- a/examples/declarative/fonts/fonts.qml +++ b/examples/declarative/fonts/fonts.qml @@ -51,9 +51,9 @@ Rectangle { } Text { text: { - if (webFont.status == 1) myText - else if (webFont.status == 2) "Loading..." - else if (webFont.status == 3) "Error loading font" + if (webFont.status == FontLoader.Ready) myText + else if (webFont.status == FontLoader.Loading) "Loading..." + else if (webFont.status == FontLoader.Error) "Error loading font" } color: "lightsteelblue" width: parent.width |