diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-27 13:25:34 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-30 20:45:08 +0000 |
| commit | 43d2b60a29df5397be4b4bead90f40346bf85dce (patch) | |
| tree | 7ac735998206e9ed76eca98d335490ad5d98bd1f /tests/auto | |
| parent | a1dbdcbd6e818118f5fc28cdd39e47a02380adbd (diff) | |
Post-merge fixes
Change-Id: I6acd29103f6cc550544e7422328d97ea0e2dcafb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/gui/qopengl/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/auto/other/lancelot/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/tests/auto/gui/qopengl/CMakeLists.txt b/tests/auto/gui/qopengl/CMakeLists.txt index d488c808f9..30c1ec94b3 100644 --- a/tests/auto/gui/qopengl/CMakeLists.txt +++ b/tests/auto/gui/qopengl/CMakeLists.txt @@ -12,6 +12,7 @@ add_qt_test(tst_qopengl Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::OpenGL ) ## Scopes: diff --git a/tests/auto/other/lancelot/CMakeLists.txt b/tests/auto/other/lancelot/CMakeLists.txt index 974112a5ad..f06586d3d4 100644 --- a/tests/auto/other/lancelot/CMakeLists.txt +++ b/tests/auto/other/lancelot/CMakeLists.txt @@ -73,8 +73,13 @@ add_qt_resource(tst_lancelot "images" ## Scopes: ##################################################################### -#### Keys ignored in scope 3:.:../../../baselineserver/shared:../../../baselineserver/shared/qbaselinetest.pri:WIN32: +extend_target(tst_lancelot CONDITION QT_FEATURE_opengl + PUBLIC_LIBRARIES + Qt::OpenGL +) + +#### Keys ignored in scope 4:.:../../../baselineserver/shared:../../../baselineserver/shared/qbaselinetest.pri:WIN32: # MKSPEC = "$$replace(QMAKESPEC, \\\\, /)" -#### Keys ignored in scope 4:.:../../../baselineserver/shared:../../../baselineserver/shared/qbaselinetest.pri:else: +#### Keys ignored in scope 5:.:../../../baselineserver/shared:../../../baselineserver/shared/qbaselinetest.pri:else: # MKSPEC = "$$QMAKESPEC" diff --git a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt index 37088f8495..1f5bb2dff8 100644 --- a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt @@ -10,6 +10,7 @@ add_qt_test(tst_qopenglwidget LIBRARIES Qt::CorePrivate Qt::GuiPrivate + Qt::OpenGLPrivate PUBLIC_LIBRARIES Qt::Gui Qt::OpenGL |