Merge branch '4.6'

2 files changed, 22 insertions, 0 deletions

diff --git a/doc/src/snippets/code/doc_src_stylesheet.qdoc b/doc/src/snippets/code/doc_src_stylesheet.qdoc
index f79f7ff..1c0440c 100644
--- a/doc/src/snippets/code/doc_src_stylesheet.qdoc
+++ b/doc/src/snippets/code/doc_src_stylesheet.qdoc
@@ -1007,6 +1007,11 @@ QHeaderView::section {
     border: 1px solid #6c6c6c;
 }
 
+QHeaderView::section:checked
+{
+    background-color: red;
+}
+
 /* style the sort indicator */
 QHeaderView::down-arrow {
     image: url(down_arrow.png);
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]