summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-11-19 04:38:46 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-11-19 04:38:46 (GMT)
commitc9333d1700bb7d063d6e1fe98b5a5900109a5d43 (patch)
tree48b4d9b10cfd176853c250107cb7d076b7bdf533 /doc/src/snippets
parentaab933d997a303f22864f8c1d843f6882a38d496 (diff)
parentadb1994279333ff7356790649548d62f623739ac (diff)
downloadQt-c9333d1700bb7d063d6e1fe98b5a5900109a5d43.zip
Qt-c9333d1700bb7d063d6e1fe98b5a5900109a5d43.tar.gz
Qt-c9333d1700bb7d063d6e1fe98b5a5900109a5d43.tar.bz2
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc/src/snippets')
-rw-r--r--doc/src/snippets/code/src_gui_painting_qregion_unix.cpp6
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]