summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Rødal <sroedal@trolltech.com>2009-09-11 15:32:43 (GMT)
committerSamuel Rødal <sroedal@trolltech.com>2009-09-11 16:57:00 (GMT)
commit1aa4cfab2d437210b8c0b064fa3bd071e53374c1 (patch)
treeb894976753dd3cddde2d0a373d7cea061af21157
parent04ee935a67b4f4296c31655d625cc3e45cb31b9b (diff)
downloadQt-1aa4cfab2d437210b8c0b064fa3bd071e53374c1.zip
Qt-1aa4cfab2d437210b8c0b064fa3bd071e53374c1.tar.gz
Qt-1aa4cfab2d437210b8c0b064fa3bd071e53374c1.tar.bz2
Added example to docs for QPainter::beginNativePainting().
Hopefully this helps clarify the use of beginNativePainting(). Reviewed-by: Trond
-rw-r--r--doc/src/snippets/code/src_gui_painting_qpainter.cpp17
-rw-r--r--src/gui/painting/qpainter.cpp9
2 files changed, 24 insertions, 2 deletions
diff --git a/doc/src/snippets/code/src_gui_painting_qpainter.cpp b/doc/src/snippets/code/src_gui_painting_qpainter.cpp
index 8dfda66..0226161 100644
--- a/doc/src/snippets/code/src_gui_painting_qpainter.cpp
+++ b/doc/src/snippets/code/src_gui_painting_qpainter.cpp
@@ -241,3 +241,20 @@ QImage image(":/images/myImage.png");
QPainter painter(this);
painter.drawImage(target, image, source);
//! [20]
+
+
+//! [21]
+QPainter painter(this);
+painter.fillRect(0, 0, 128, 128, Qt::green);
+painter.beginNativePainting();
+
+glEnable(GL_SCISSOR_TEST);
+glScissor(0, 0, 64, 64);
+
+glClearColor(1, 0, 0, 1);
+glClear(GL_COLOR_BUFFER_BIT);
+
+glDisable(GL_SCISSOR_TEST);
+
+painter.endNativePainting();
+//! [21]
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 2dcc20c..a9257c7 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -1894,8 +1894,13 @@ QPaintEngine *QPainter::paintEngine() const
/*!
Flushes the painting pipeline and prepares for the user issuing
- native painting commands. Must be followed by a call to
- endNativePainting().
+ commands directly to the underlying graphics context. Must be
+ followed by a call to endNativePainting().
+
+ Here is an example that shows intermixing of painter commands
+ and raw OpenGL commands:
+
+ \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 21
\sa endNativePainting()
*/