diff options
| author | Martin Smith <msmith@trolltech.com> | 2009-11-19 14:35:34 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2009-11-19 14:35:34 (GMT) |
| commit | fb0ab6fbb9cf01fa4012fe67275ed4a4f3e2b71b (patch) | |
| tree | c236e338f29c3e12ffdbeafcaed083b29a1f48b9 /doc/src/snippets/code | |
| parent | 51b3c2e652578f5577c07c22e177699d345c1dd7 (diff) | |
| parent | fbbdf8698fb0444d5170b7d0a14e870ea789398f (diff) | |
| download | Qt-fb0ab6fbb9cf01fa4012fe67275ed4a4f3e2b71b.zip Qt-fb0ab6fbb9cf01fa4012fe67275ed4a4f3e2b71b.tar.gz Qt-fb0ab6fbb9cf01fa4012fe67275ed4a4f3e2b71b.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'doc/src/snippets/code')
| -rw-r--r-- | doc/src/snippets/code/src_gui_painting_qregion_unix.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/doc/src/snippets/code/src_gui_painting_qregion_unix.cpp b/doc/src/snippets/code/src_gui_painting_qregion_unix.cpp index fb1f363..ea42e70 100644 --- a/doc/src/snippets/code/src_gui_painting_qregion_unix.cpp +++ b/doc/src/snippets/code/src_gui_painting_qregion_unix.cpp @@ -41,19 +41,15 @@ //! [0] QRegion r1(10, 10, 20, 20); -r1.isNull(); // false r1.isEmpty(); // false -QRegion r2(40, 40, 20, 20); QRegion r3; -r3.isNull(); // true r3.isEmpty(); // true +QRegion r2(40, 40, 20, 20); r3 = r1.intersected(r2); // r3: intersection of r1 and r2 -r3.isNull(); // false r3.isEmpty(); // true r3 = r1.united(r2); // r3: union of r1 and r2 -r3.isNull(); // false r3.isEmpty(); // false //! [0] |