diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-03-18 17:38:36 +0100 |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-03-18 17:38:36 +0100 |
| commit | 1decfbb7220d80b1c9245d50876a4e8342f78a95 (patch) | |
| tree | 8c7793bce3c54cfe9c5579ebc6dec38ab7140125 /doc | |
| parent | 15394b8a8a8efa27e7deef43dc9ba6067bb743a1 (diff) | |
| parent | d713d4e588543957ea4b4d9f2dc546be2b036928 (diff) | |
Merge branch '4.7' of /home/dboddie/git/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 c5bc279210..65104bd921 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 c4b5ebc38d..b3795d65d8 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 |