summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code
diff options
context:
space:
mode:
authorBill King <bill.king@nokia.com>2009-11-18 22:32:16 (GMT)
committerBill King <bill.king@nokia.com>2009-11-18 22:32:16 (GMT)
commit0186faea383f3f8223bffd1844e5a47ca22770a5 (patch)
tree8b17a7c752ada7c06d1d9b88575d5bd467dd3fbe /doc/src/snippets/code
parentc7ef9c969fb368027135c5e7b0e9b6f53c465702 (diff)
parent80cd617b05ad3e647c87dc063d40cde0617344ca (diff)
downloadQt-0186faea383f3f8223bffd1844e5a47ca22770a5.zip
Qt-0186faea383f3f8223bffd1844e5a47ca22770a5.tar.gz
Qt-0186faea383f3f8223bffd1844e5a47ca22770a5.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
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]