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

Conflicts:
	mkspecs/qnx-armv7le-qcc/qplatformdefs.h
	src/printsupport/kernel/qcups.cpp
	src/widgets/styles/qstyle.h
	tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp

Change-Id: Ia41e13051169a6d4a8a1267548e7d47b859bb267

1 files changed, 6 insertions, 2 deletions

diff --git a/src/widgets/kernel/qopenglwidget.cpp b/src/widgets/kernel/qopenglwidget.cpp
index 66aacadb28..10be5aef16 100644
--- a/src/widgets/kernel/qopenglwidget.cpp
+++ b/src/widgets/kernel/qopenglwidget.cpp
@@ -60,7 +60,6 @@ public:
     QOpenGLWidgetPrivate()
         : fbo(0), uninitialized(true)
     {
-        setRenderToTexture();
     }
     GLuint textureId() const { return fbo ? fbo->texture() : 0; }
 
@@ -91,6 +90,8 @@ void QOpenGLWidgetPrivate::initialize()
 QOpenGLWidget::QOpenGLWidget(QWidget *parent, Qt::WindowFlags f)
     : QWidget(*(new QOpenGLWidgetPrivate), parent, f)
 {
+    Q_D(QOpenGLWidget);
+    d->setRenderToTexture();
 }
 
 QOpenGLWidget::~QOpenGLWidget()
@@ -146,6 +147,9 @@ void QOpenGLWidget::paintGL()
 void QOpenGLWidget::updateGL()
 {
     Q_D(QOpenGLWidget);
+    if (d->uninitialized)
+        return;
+
     makeCurrent();
     paintGL();
     d->context.functions()->glFlush();
@@ -163,7 +167,7 @@ void QOpenGLWidget::resizeEvent(QResizeEvent *)
 
     d->context.makeCurrent(d->surface());
     delete d->fbo; // recreate when resized
-    d->fbo = new QOpenGLFramebufferObject(size() * devicePixelRatio());
+    d->fbo = new QOpenGLFramebufferObject(size() * devicePixelRatio(), QOpenGLFramebufferObject::CombinedDepthStencil);
     d->fbo->bind();
     QOpenGLFunctions *funcs = d->context.functions();
     funcs->glBindTexture(GL_TEXTURE_2D, d->fbo->texture());