Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	src/corelib/io/qdatastream.cpp
	src/corelib/io/qdatastream.h
	src/corelib/json/qjsonwriter.cpp
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/xcb/qxcbkeyboard.cpp

Change-Id: I46fef1455f5a9f2ce1ec394a3c65881093c51b62

4 files changed, 7 insertions, 10 deletions

diff --git a/examples/opengl/grabber/mainwindow.cpp b/examples/opengl/grabber/mainwindow.cpp
index 9f31733856..9f82ee10ba 100644
--- a/examples/opengl/grabber/mainwindow.cpp
+++ b/examples/opengl/grabber/mainwindow.cpp
@@ -175,7 +175,7 @@ QSlider *MainWindow::createSlider(const char *changedSignal,
 void MainWindow::setPixmap(const QPixmap &pixmap)
 {
     pixmapLabel->setPixmap(pixmap);
-    QSize size = pixmap.size();
+    QSize size = pixmap.size() / pixmap.devicePixelRatio();
     if (size - QSize(1, 0) == pixmapLabelArea->maximumViewportSize())
         size -= QSize(1, 0);
     pixmapLabel->resize(size);
diff --git a/examples/opengl/overpainting/glwidget.cpp b/examples/opengl/overpainting/glwidget.cpp
index 78f5f96c48..420ae3e881 100644
--- a/examples/opengl/overpainting/glwidget.cpp
+++ b/examples/opengl/overpainting/glwidget.cpp
@@ -161,7 +161,8 @@ void GLWidget::paintEvent(QPaintEvent *event)
     static GLfloat lightPosition[4] = { 0.5, 5.0, 7.0, 1.0 };
     glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
 
-    setupViewport(width(), height());
+    qreal pixelRatio = devicePixelRatio();
+    setupViewport(width() * pixelRatio, height() * pixelRatio);
 //! [6]
 
 //! [7]
@@ -200,7 +201,8 @@ void GLWidget::paintEvent(QPaintEvent *event)
 //! [11]
 void GLWidget::resizeGL(int width, int height)
 {
-    setupViewport(width, height);
+    qreal pixelRatio = devicePixelRatio();
+    setupViewport(width*pixelRatio, height*pixelRatio);
 }
 //! [11]
 
diff --git a/examples/opengl/paintedwindow/paintedwindow.cpp b/examples/opengl/paintedwindow/paintedwindow.cpp
index d891f8d563..c8f1f236ba 100644
--- a/examples/opengl/paintedwindow/paintedwindow.cpp
+++ b/examples/opengl/paintedwindow/paintedwindow.cpp
@@ -88,14 +88,10 @@ PaintedWindow::PaintedWindow()
     connect(this, SIGNAL(rotationChanged(qreal)), this, SLOT(paint()));
 }
 
-void PaintedWindow::resizeEvent(QResizeEvent *)
-{
-    paint();
-}
-
 void PaintedWindow::exposeEvent(QExposeEvent *)
 {
-    paint();
+    if (isExposed())
+        paint();
 }
 
 void PaintedWindow::mousePressEvent(QMouseEvent *)
diff --git a/examples/opengl/paintedwindow/paintedwindow.h b/examples/opengl/paintedwindow/paintedwindow.h
index c5b7976d59..f185cd3733 100644
--- a/examples/opengl/paintedwindow/paintedwindow.h
+++ b/examples/opengl/paintedwindow/paintedwindow.h
@@ -74,7 +74,6 @@ private slots:
     void rotationDone();
 
 private:
-    void resizeEvent(QResizeEvent *);
     void exposeEvent(QExposeEvent *);
     void mousePressEvent(QMouseEvent *);