summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2009-11-19 05:29:51 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2009-11-19 05:29:51 (GMT)
commit0276466cac5a367f9337062d6d524b493e51ff0f (patch)
tree9d87f61500b84f162ecc2c4ce26cefab838f80b1 /doc/src/snippets/code
parent3e52973f552391a5159b27d6252a81f6a1d52d8c (diff)
parent1c0d43cf8f2543be89ba02e659b8fd7e975f7f96 (diff)
downloadQt-0276466cac5a367f9337062d6d524b493e51ff0f.zip
Qt-0276466cac5a367f9337062d6d524b493e51ff0f.tar.gz
Qt-0276466cac5a367f9337062d6d524b493e51ff0f.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc/src/snippets/code')
-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]