diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-08-19 10:20:12 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-08-19 13:49:14 +0000 |
| commit | d47e412b7b196e37196fa7c7469ae3b54eecf6d4 (patch) | |
| tree | 3c3468f270182e0537e6104a2003fae72fb8d4e3 /tests | |
| parent | 48bc5ce99ccc3857b1663bcb75b71a9319a0e8e4 (diff) | |
| download | qtmultimedia-d47e412b7b196e37196fa7c7469ae3b54eecf6d4.tar.gz | |
Adjust to qtConfig() changes in qtbase
Change-Id: I26d80ece18abf882338de5ce0258469ed103a0eb
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/unit/multimediawidgets.pro | 2 | ||||
| -rw-r--r-- | tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro | 6 |
2 files changed, 3 insertions, 5 deletions
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 |