summaryrefslogtreecommitdiffstats
path: root/tests/benchmarks/opengl/main.cpp
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2020-04-17 11:43:38 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2020-04-20 17:44:13 +0200
commit7202df3689f98a43462dc6411c4593153d300ccd (patch)
tree07baedaef03d5c5ddc0c7343eaf75c4d7980db5f /tests/benchmarks/opengl/main.cpp
parent13873c6bc6e9514e4b6d4e11f7100863a439e33c (diff)
Replace QTime with QElapsedTimer in benchmarks
Various benchmarks were still using the deprecated timing API. One didn't even *use* the timer it implemented this way. One was just using start as a short-hand for assigning to currentTime(). Change-Id: If406d0fb606e454fec056f386bcd0aa6726ee96e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'tests/benchmarks/opengl/main.cpp')
-rw-r--r--tests/benchmarks/opengl/main.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/benchmarks/opengl/main.cpp b/tests/benchmarks/opengl/main.cpp
index 0886c0e55b..9462f35c38 100644
--- a/tests/benchmarks/opengl/main.cpp
+++ b/tests/benchmarks/opengl/main.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the test suite of the Qt Toolkit.
@@ -27,6 +27,7 @@
****************************************************************************/
#include <QtGui>
#include <QtOpenGL>
+#include <QtCore/QElapsedTimer>
#include <qtest.h>
@@ -400,7 +401,7 @@ void OpenGLBench::textureUpload()
pb->makeCurrent();
QGLContext *context = const_cast<QGLContext *>(QGLContext::currentContext());
- QTime time;
+ QElapsedTimer time;
time.start();
context->bindTexture(pixmap, GL_TEXTURE_2D, format, (QGLContext::BindOptions) flags);