diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-11 17:17:13 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-11 17:17:51 +0200 |
| commit | 4dac45c9ee59ff6586d90d423654da91523ab679 (patch) | |
| tree | cd4a4adf2cbc9e77bf86d2d11e71ec66afdf3be4 /src/gui/configure.cmake | |
| parent | 078cd61751aeaa310d35a3d596a21a36004a1a0f (diff) | |
| parent | f44850b5c3464cdda0ee9b1ee858d95f3ffaa3e2 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I715b1d743d5f11560e7b3fbeb8fd64a5e5ddb277
Diffstat (limited to 'src/gui/configure.cmake')
| -rw-r--r-- | src/gui/configure.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index d8cd47db49..f674311ed2 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -665,9 +665,13 @@ qt_feature("opengl" PUBLIC CONDITION QT_FEATURE_opengl_desktop OR QT_FEATURE_opengl_dynamic OR QT_FEATURE_opengles2 ) qt_feature_definition("opengl" "QT_NO_OPENGL" NEGATE VALUE "1") +qt_feature("vkgen" PRIVATE + LABEL "vkgen" + CONDITION QT_FEATURE_xmlstreamreader +) qt_feature("vulkan" PUBLIC LABEL "Vulkan" - CONDITION Vulkan_FOUND + CONDITION QT_FEATURE_vkgen AND Vulkan_FOUND ) qt_feature("openvg" PUBLIC LABEL "OpenVG" |