diff options
| author | Jarek Kobus <jkobus@trolltech.com> | 2009-04-15 13:21:56 (GMT) |
|---|---|---|
| committer | Jarek Kobus <jkobus@trolltech.com> | 2009-04-15 13:21:56 (GMT) |
| commit | f9cd98337bdf4add768b27540cc28e6508a6c0ad (patch) | |
| tree | 7f0a360babbad631c572b220a9fb306032fa1878 /doc/src | |
| parent | cca58cff45ea248ab9c65fd8ce088433af1c0fe0 (diff) | |
| parent | 0da501b644c0799d4e5e357b27847cb7a58583e4 (diff) | |
| download | Qt-f9cd98337bdf4add768b27540cc28e6508a6c0ad.zip Qt-f9cd98337bdf4add768b27540cc28e6508a6c0ad.tar.gz Qt-f9cd98337bdf4add768b27540cc28e6508a6c0ad.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/examples/qxmlstreambookmarks.qdoc | 5 | ||||
| -rw-r--r-- | doc/src/qnamespace.qdoc | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/src/examples/qxmlstreambookmarks.qdoc b/doc/src/examples/qxmlstreambookmarks.qdoc index 7059043..fb3a1c1 100644 --- a/doc/src/examples/qxmlstreambookmarks.qdoc +++ b/doc/src/examples/qxmlstreambookmarks.qdoc @@ -103,8 +103,9 @@ The \c read() function accepts a QIODevice and sets it using \l{QXmlStreamReader::setDevice()}{setDevice()}. The actual process - of reading only takes place in event the file is a valid XBEL 1.0 - file. Otherwise, the \l{QXmlStreamReader::raiseError()} + of reading only takes place if the file is a valid XBEL 1.0 file. + Note that the XML input needs to be well-formed to be accepted by + QXmlStreamReader. Otherwise, the \l{QXmlStreamReader::raiseError()} {raiseError()} function is used to display an error message. \snippet examples/xml/streambookmarks/xbelreader.cpp 1 diff --git a/doc/src/qnamespace.qdoc b/doc/src/qnamespace.qdoc index e6a1a36..d9f001e 100644 --- a/doc/src/qnamespace.qdoc +++ b/doc/src/qnamespace.qdoc @@ -142,7 +142,7 @@ QAction::iconVisibleInMenu property. Menus that are currently open or menus already created in the native - Mac OS X menubar MAY NOT pick up a change in this attribute. Changes + Mac OS X menubar \e{may not} pick up a change in this attribute. Changes in the QAction::iconVisibleInMenu property will always be picked up. \value AA_NativeWindows Ensures that widgets have native windows. |