diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-21 19:09:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-21 19:09:56 (GMT) |
| commit | 43a1d0839be33754c5da78d8255e7b4c37a910e0 (patch) | |
| tree | b6e728b3e687eb1ce5d8235f494a47618ddf7a3e /doc/src | |
| parent | 4555064bb1029ca7cb86d25d16cd35f6311716d1 (diff) | |
| parent | 972fcb6de69fb7ed3ae8147498ceb5d2ac79f057 (diff) | |
| download | Qt-43a1d0839be33754c5da78d8255e7b4c37a910e0.zip Qt-43a1d0839be33754c5da78d8255e7b4c37a910e0.tar.gz Qt-43a1d0839be33754c5da78d8255e7b4c37a910e0.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QPainterPath: Ignore calls with NaN/Infinite parameters
Doc: Fixing typo
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/declarative/basictypes.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/declarative/basictypes.qdoc b/doc/src/declarative/basictypes.qdoc index 463e4a3..99f1bed 100644 --- a/doc/src/declarative/basictypes.qdoc +++ b/doc/src/declarative/basictypes.qdoc @@ -582,7 +582,7 @@ An enumeration type consists of a set of named values. - An enumeration value may be specifed as either a string: + An enumeration value may be specified as either a string: \qml Text { horizontalAlignment: "AlignRight" } \endqml |