diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-11-20 12:19:09 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-11-20 12:19:09 (GMT) |
| commit | b5294497836db44261c97cfeab28d0ac4f8402f1 (patch) | |
| tree | c4331314445b41166ce2cd22a80c9fb9f46b5023 /doc/src/snippets/code/src_gui_painting_qregion_unix.cpp | |
| parent | 2473ab1cf217a989849190cbfa47fe312698adb9 (diff) | |
| parent | 1b8d5bec5763708c66e7bd586aee3df7f94b5cb5 (diff) | |
| download | Qt-b5294497836db44261c97cfeab28d0ac4f8402f1.zip Qt-b5294497836db44261c97cfeab28d0ac4f8402f1.tar.gz Qt-b5294497836db44261c97cfeab28d0ac4f8402f1.tar.bz2 | |
Merge branch '4.6' into mmfphonon
Conflicts:
demos/qmediaplayer/mediaplayer.cpp
Diffstat (limited to 'doc/src/snippets/code/src_gui_painting_qregion_unix.cpp')
| -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] |