From d47e412b7b196e37196fa7c7469ae3b54eecf6d4 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 19 Aug 2016 10:20:12 +0200 Subject: Adjust to qtConfig() changes in qtbase Change-Id: I26d80ece18abf882338de5ce0258469ed103a0eb Reviewed-by: Yoann Lopes Reviewed-by: Oswald Buddenhagen --- tests/auto/unit/multimediawidgets.pro | 2 +- tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'tests/auto/unit') diff --git a/tests/auto/unit/multimediawidgets.pro b/tests/auto/unit/multimediawidgets.pro index 31f8e546c..1bcfc6c2e 100644 --- a/tests/auto/unit/multimediawidgets.pro +++ b/tests/auto/unit/multimediawidgets.pro @@ -7,7 +7,7 @@ SUBDIRS += \ # Tests depending on private interfaces should only be built if # these interfaces are exported. -contains (QT_CONFIG, private_tests) { +qtConfig(private_tests) { SUBDIRS += \ qgraphicsvideoitem \ qpaintervideosurface \ diff --git a/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro b/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro index 848b1c806..f1db2c5fb 100644 --- a/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro +++ b/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro @@ -2,11 +2,9 @@ CONFIG += testcase TARGET = tst_qpaintervideosurface QT += multimedia-private multimediawidgets-private testlib -qtHaveModule(opengl) { +qtHaveModule(opengl): \ QT += opengl -} else { - DEFINES += QT_NO_OPENGL -} + SOURCES += tst_qpaintervideosurface.cpp -- cgit v1.2.3