diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-03-18 15:43:48 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-03-18 15:43:48 (GMT) |
| commit | d713d4e588543957ea4b4d9f2dc546be2b036928 (patch) | |
| tree | 0bc1fd0572a2a8caf6f5fbda9d75e8df54be2dcf /doc | |
| parent | 3a2beec9378689c2ad32743cdf7965a49fc016df (diff) | |
| parent | 3a764060dab07ef0b51d7027b9606c73c0701d2f (diff) | |
| download | Qt-d713d4e588543957ea4b4d9f2dc546be2b036928.zip Qt-d713d4e588543957ea4b4d9f2dc546be2b036928.tar.gz Qt-d713d4e588543957ea4b4d9f2dc546be2b036928.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/examples/undoframework.qdoc | 3 | ||||
| -rw-r--r-- | doc/src/howtos/exceptionsafety.qdoc | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/examples/undoframework.qdoc b/doc/src/examples/undoframework.qdoc index c5bc279..65104bd 100644 --- a/doc/src/examples/undoframework.qdoc +++ b/doc/src/examples/undoframework.qdoc @@ -199,8 +199,7 @@ \snippet examples/tools/undoframework/commands.cpp 8 - \c undo() removes the item from the scene. We need to update the - scene as ...(ask Andreas) + \c undo() removes the item from the scene. \snippet examples/tools/undoframework/commands.cpp 9 diff --git a/doc/src/howtos/exceptionsafety.qdoc b/doc/src/howtos/exceptionsafety.qdoc index c4b5ebc..b3795d6 100644 --- a/doc/src/howtos/exceptionsafety.qdoc +++ b/doc/src/howtos/exceptionsafety.qdoc @@ -100,8 +100,9 @@ if any allocation fails. Allocations can fail if the system runs out of memory or doesn't have enough continuous memory to allocate the requested size. - Exceptions to that rule are documented. As an example, \l QImage::create() - returns false if not enough memory exists instead of throwing an exception. + Exceptions to that rule are documented. As an example, QImage constructors will + create a \l{QImage::isNull()}{null} image if not enough memory exists instead + of throwing an exception. \section1 Recovering from exceptions |