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

Conflicts:
	src/network/access/qhttpthreaddelegate.cpp

Change-Id: Ia15372687c93cd585967b006c0baaac3a5f29e91

1 files changed, 6 insertions, 6 deletions

diff --git a/examples/opengl/hellogl_es2/glwidget.cpp b/examples/opengl/hellogl_es2/glwidget.cpp
index a5c22447f0..7267cfd124 100644
--- a/examples/opengl/hellogl_es2/glwidget.cpp
+++ b/examples/opengl/hellogl_es2/glwidget.cpp
@@ -308,12 +308,12 @@ void GLWidget::paintGL()
             bubble->drawBubble(&painter);
     }
 
-    QString framesPerSecond;
-    framesPerSecond.setNum(frames /(time.elapsed() / 1000.0), 'f', 2);
-
-    painter.setPen(Qt::white);
-
-    painter.drawText(20, 40, framesPerSecond + " fps");
+    if (const int elapsed = time.elapsed()) {
+        QString framesPerSecond;
+        framesPerSecond.setNum(frames /(elapsed / 1000.0), 'f', 2);
+        painter.setPen(Qt::white);
+        painter.drawText(20, 40, framesPerSecond + " fps");
+    }
 
     painter.end();