diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-16 13:23:07 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-16 14:04:20 +0100 |
| commit | 971968fb924b98933b33017e6ff7604fc51b63e7 (patch) | |
| tree | fac1ca16ec95b2267a20bcdc221e7eff03f29683 /tests/benchmarks | |
| parent | 510af90b9f759807709e5d81a27ccec05a39ca1d (diff) | |
CMake: Fix painting benchmark dependency on OpenGLWidgets
Change-Id: Ic7ed89c51e9a3cabda60ec99702b3aacd2cf5e97
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests/benchmarks')
| -rw-r--r-- | tests/benchmarks/qml/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/benchmarks/qml/painting/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/benchmarks/qml/painting/painting.pro | 1 | ||||
| -rw-r--r-- | tests/benchmarks/qml/qml.pro | 5 |
4 files changed, 9 insertions, 3 deletions
diff --git a/tests/benchmarks/qml/CMakeLists.txt b/tests/benchmarks/qml/CMakeLists.txt index 816ad1856e..e1ce51462f 100644 --- a/tests/benchmarks/qml/CMakeLists.txt +++ b/tests/benchmarks/qml/CMakeLists.txt @@ -12,6 +12,8 @@ add_subdirectory(script) add_subdirectory(js) add_subdirectory(creation) if(TARGET Qt::OpenGL) - add_subdirectory(painting) add_subdirectory(qquickwindow) endif() +if(TARGET Qt::OpenGL AND TARGET Qt::OpenGLWidgets) + add_subdirectory(painting) +endif() diff --git a/tests/benchmarks/qml/painting/CMakeLists.txt b/tests/benchmarks/qml/painting/CMakeLists.txt index aa126450a6..a54bf6c22e 100644 --- a/tests/benchmarks/qml/painting/CMakeLists.txt +++ b/tests/benchmarks/qml/painting/CMakeLists.txt @@ -15,7 +15,7 @@ qt_add_benchmark(painting ) #### Keys ignored in scope 1:.:.:painting.pro:<TRUE>: -# _REQUIREMENTS = "qtHaveModule(opengl)" "qtHaveModule(widgets)" +# _REQUIREMENTS = "qtHaveModule(opengl)" "qtHaveModule(openglwidgets)" "qtHaveModule(widgets)" ## Scopes: ##################################################################### diff --git a/tests/benchmarks/qml/painting/painting.pro b/tests/benchmarks/qml/painting/painting.pro index 9948df511a..2443995bed 100644 --- a/tests/benchmarks/qml/painting/painting.pro +++ b/tests/benchmarks/qml/painting/painting.pro @@ -1,4 +1,5 @@ requires(qtHaveModule(opengl)) +requires(qtHaveModule(openglwidgets)) requires(qtHaveModule(widgets)) QT += opengl widgets openglwidgets diff --git a/tests/benchmarks/qml/qml.pro b/tests/benchmarks/qml/qml.pro index 437d13c87e..128017fec3 100644 --- a/tests/benchmarks/qml/qml.pro +++ b/tests/benchmarks/qml/qml.pro @@ -13,4 +13,7 @@ SUBDIRS += \ js \ creation -qtHaveModule(opengl): SUBDIRS += painting qquickwindow +qtHaveModule(opengl) { + SUBDIRS += qquickwindow + qtHaveModule(openglwidgets): SUBDIRS += painting +} |