summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-11-17 14:27:44 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-11-17 14:27:44 (GMT)
commite76c4c03c98091ee3e509a0f9b64daba472567ff (patch)
treec110868f3529320162315b9d082855203df641f4 /doc/src
parent5d4049764e6747f5e6336826de505b872a26bea4 (diff)
parent60a37296cf553fbfb96afc90c7ce84cd386bc151 (diff)
downloadQt-e76c4c03c98091ee3e509a0f9b64daba472567ff.zip
Qt-e76c4c03c98091ee3e509a0f9b64daba472567ff.tar.gz
Qt-e76c4c03c98091ee3e509a0f9b64daba472567ff.tar.bz2
Merge remote branch 'tools-team/4.6' into 4.6
Diffstat (limited to 'doc/src')
-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]