diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-04-16 01:14:26 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-04-16 01:14:26 (GMT) |
| commit | 91edfd0bf779bdf835bd5dff8151db96c319bee9 (patch) | |
| tree | 42148169b2be7fd5c25da5e1c065c9aaa34235a5 /doc/src | |
| parent | 5174ef058693fb3c5420bd9ed555ebf0dfc758a2 (diff) | |
| parent | 287d5e7b349dac0cfdb74e9747752fcadc432064 (diff) | |
| download | Qt-91edfd0bf779bdf835bd5dff8151db96c319bee9.zip Qt-91edfd0bf779bdf835bd5dff8151db96c319bee9.tar.gz Qt-91edfd0bf779bdf835bd5dff8151db96c319bee9.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. |