diff options
Diffstat (limited to 'tests/auto/unit')
4 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/unit/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp b/tests/auto/unit/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp index fb689fbd3..f4759bbf7 100644 --- a/tests/auto/unit/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp +++ b/tests/auto/unit/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp @@ -28,7 +28,7 @@ //TESTED_COMPONENT=src/multimedia -#include <qtmultimediadefs.h> +#include <qtmultimediaglobal.h> #include "qgraphicsvideoitem.h" #include <QtTest/QtTest> #include "qmediaobject.h" diff --git a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp index 0548d1e1a..d2b43c56d 100644 --- a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp +++ b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp @@ -299,7 +299,7 @@ void tst_QMediaObject::notifySignals() QTRY_COMPARE(spy.count(), count); qint64 elapsed = timer.elapsed(); - int expectedElapsed = count * interval * 1.3; // give it some margin of error + int expectedElapsed = count * interval * 1.5; // give it some margin of error QVERIFY2(elapsed < expectedElapsed, QString("elapsed: %1, expected: %2").arg(elapsed).arg(expectedElapsed).toLocal8Bit().constData()); } diff --git a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp index ae1f7a5bc..4b2136a5c 100644 --- a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp +++ b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp @@ -34,7 +34,7 @@ #include <QtWidgets/qapplication.h> #include <qvideosurfaceformat.h> -#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1) +#if QT_CONFIG(opengl) #include <QtOpenGL/qgl.h> #include <QtOpenGL/qglframebufferobject.h> #include <QtGui/qopenglfunctions.h> @@ -57,7 +57,7 @@ private slots: void present(); void presentOpaqueFrame(); -#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1) +#if QT_CONFIG(opengl) void shaderType(); @@ -78,7 +78,7 @@ private slots: Q_DECLARE_METATYPE(const uchar *) -#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1) +#if QT_CONFIG(opengl) Q_DECLARE_METATYPE(QPainterVideoSurface::ShaderType); class QtTestGLVideoBuffer : public QAbstractVideoBuffer @@ -551,7 +551,7 @@ void tst_QPainterVideoSurface::presentOpaqueFrame() QCOMPARE(surface.error(), QAbstractVideoSurface::IncorrectFormatError); } -#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1) +#if QT_CONFIG(opengl) void tst_QPainterVideoSurface::shaderType() { diff --git a/tests/auto/unit/qvideowidget/tst_qvideowidget.cpp b/tests/auto/unit/qvideowidget/tst_qvideowidget.cpp index a1d16e60b..3baa72281 100644 --- a/tests/auto/unit/qvideowidget/tst_qvideowidget.cpp +++ b/tests/auto/unit/qvideowidget/tst_qvideowidget.cpp @@ -28,7 +28,7 @@ //TESTED_COMPONENT=src/multimedia -#include <qtmultimediadefs.h> +#include <qtmultimediaglobal.h> #include <QtTest/QtTest> #include "qvideowidget.h" |